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.

R=ben@chromium.org, jschuh@chromium.org
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

2 files changed, 6 insertions, 6 deletions

diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
index 5cce7e3..a2f02fb 100644
--- a/ui/gfx/icon_util.cc
+++ b/ui/gfx/icon_util.cc
@@ -357,8 +357,8 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
   // If |large_bitmap| was specified, validate its dimension and convert to PNG.
   scoped_refptr<base::RefCountedMemory> png_bytes;
   if (!large_bitmap.empty()) {
-    DCHECK_EQ(256, large_bitmap.width());
-    DCHECK_EQ(256, large_bitmap.height());
+    CHECK_EQ(256, large_bitmap.width());
+    CHECK_EQ(256, large_bitmap.height());
     png_bytes = gfx::Image(large_bitmap).As1xPNGBytes();
   }
 
@@ -391,7 +391,7 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
   std::vector<uint8> buffer(buffer_size);
   ICONDIR* icon_dir = reinterpret_cast<ICONDIR*>(&buffer[0]);
   icon_dir->idType = kResourceTypeIcon;
-  icon_dir->idCount = bitmap_count;
+  icon_dir->idCount = static_cast<WORD>(bitmap_count);
   size_t icon_dir_count = bitmap_count - 1;  // Note DCHECK(!bitmaps.empty())!
 
   // Increment counts if a PNG entry will be added.
@@ -418,8 +418,8 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
     entry->bHeight = 0;
     entry->wPlanes = 1;
     entry->wBitCount = 32;
-    entry->dwBytesInRes = png_bytes->size();
-    entry->dwImageOffset = offset;
+    entry->dwBytesInRes = static_cast<DWORD>(png_bytes->size());
+    entry->dwImageOffset = static_cast<DWORD>(offset);
     memcpy(&buffer[offset], png_bytes->front(), png_bytes->size());
     offset += png_bytes->size();
   }
diff --git a/ui/gfx/text_utils.cc b/ui/gfx/text_utils.cc
index a5a1b79..8a2658c 100644
--- a/ui/gfx/text_utils.cc
+++ b/ui/gfx/text_utils.cc
@@ -13,7 +13,7 @@ string16 RemoveAcceleratorChar(const string16& s,
                                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;