Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

chrome/browser/ui/toolbar/wrench_menu_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 263 matching lines @@
       return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_PRE_SYNCED_LABEL,
           l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
     }
     default:
       NOTREACHED();
       return string16();
   }
 }
 
 bool WrenchMenuModel::GetIconForCommandId(int command_id,
-                                          SkBitmap* icon) const {
+                                          gfx::ImageSkia* icon) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   switch (command_id) {
     case IDC_UPGRADE_DIALOG: {
       if (UpgradeDetector::GetInstance()->notify_upgrade()) {
-        *icon = *rb.GetNativeImageNamed(
+        *icon = *rb.GetImageNamed(
             UpgradeDetector::GetInstance()->GetIconResourceID(
-                UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON)).ToSkBitmap();
+                UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON)).ToImageSkia();
         return true;
       }
       return false;
     }
     case IDC_SHOW_SYNC_SETUP: {
       ProfileSyncService* service =
           ProfileSyncServiceFactory::GetInstance()->GetForProfile(
               browser_->profile()->GetOriginalProfile());
       SyncGlobalError* error = service->sync_global_error();
       if (error && error->HasCustomizedSyncMenuItem()) {
         int icon_id = error->MenuItemIconResourceID();
         if (icon_id) {
-          *icon = *rb.GetNativeImageNamed(icon_id).ToSkBitmap();
+          *icon = *rb.GetImageNamed(icon_id).ToImageSkia();
           return true;
         }
       }
       return false;
     }
     default:
       break;
   }
   return false;
 }
@@ skipping 292 matching lines @@
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   Profile* profile = browser_->profile()->GetOriginalProfile();
   return sync_ui_util::GetSyncMenuLabel(
       ProfileSyncServiceFactory::GetForProfile(profile),
       *SigninManagerFactory::GetForProfile(profile));
 }