some fixes and warning disables in ui/ for building on win x64
- Some |int|s that should be |ptrdiff_t|s.
- Icon structures are packing to known size (same signs).
- GetWindowLong needs to be GetWindowLongPtr to work on 32 & 64.
[email protected], [email protected]
BUG=167187, 166496
Review URL: https://chromiumcodereview.appspot.com/11889017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176860 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/gfx/text_utils.cc b/ui/gfx/text_utils.cc
index a5a1b799..8a2658c 100644
--- a/ui/gfx/text_utils.cc
+++ b/ui/gfx/text_utils.cc
@@ -13,7 +13,7 @@
int* accelerated_char_pos,
int* accelerated_char_span) {
bool escaped = false;
- int last_char_pos = -1;
+ ptrdiff_t last_char_pos = -1;
int last_char_span = 0;
base::i18n::UTF16CharIterator chars(&s);
string16 accelerator_removed;
