Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/views/toolbar_view.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/views/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 62 matching lines @@
 #endif
 
 const int kPopupTopSpacingNonGlass = 3;
 const int kPopupBottomSpacingNonGlass = 2;
 const int kPopupBottomSpacingGlass = 1;
 
 // Top margin for the wrench menu badges (badge is placed in the upper right
 // corner of the wrench menu).
 const int kBadgeTopMargin = 2;
 
-SkBitmap* kPopupBackgroundEdge = NULL;
+gfx::ImageSkia* kPopupBackgroundEdge = NULL;
 
 // The omnibox border has some additional shadow, so we use less vertical
 // spacing than ToolbarView::kVertSpacing.
 int location_bar_vert_spacing() {
   static int value = -1;
   if (value == -1) {
     switch (ui::GetDisplayLayout()) {
       case ui::LAYOUT_ASH:
       case ui::LAYOUT_DESKTOP:
         value = 4;
@@ skipping 36 matching lines @@
 
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
 
   display_mode_ = browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ?
       DISPLAYMODE_NORMAL : DISPLAYMODE_LOCATION;
 
   if (!kPopupBackgroundEdge) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    kPopupBackgroundEdge = rb.GetBitmapNamed(IDR_LOCATIONBG_POPUPMODE_EDGE);
+    kPopupBackgroundEdge = rb.GetImageSkiaNamed(IDR_LOCATIONBG_POPUPMODE_EDGE);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                  content::NotificationService::AllSources());
 #if defined(OS_WIN)
   registrar_.Add(this, chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED,
                  content::NotificationService::AllSources());
 #endif
   registrar_.Add(this,
                  chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE,
@@ skipping 117 matching lines @@
 }
 
 void ToolbarView::AddMenuListener(views::MenuListener* listener) {
   menu_listeners_.AddObserver(listener);
 }
 
 void ToolbarView::RemoveMenuListener(views::MenuListener* listener) {
   menu_listeners_.RemoveObserver(listener);
 }
 
-SkBitmap ToolbarView::GetAppMenuIcon(views::CustomButton::ButtonState state) {
+gfx::ImageSkia ToolbarView::GetAppMenuIcon(
+    views::CustomButton::ButtonState state) {
   ui::ThemeProvider* tp = GetThemeProvider();
 
   int id = 0;
   switch (state) {
     case views::CustomButton::BS_NORMAL: id = IDR_TOOLS;   break;
     case views::CustomButton::BS_HOT:    id = IDR_TOOLS_H; break;
     case views::CustomButton::BS_PUSHED: id = IDR_TOOLS_P; break;
     default:                             NOTREACHED();     break;
   }
-  SkBitmap icon = *tp->GetBitmapNamed(id);
+  gfx::ImageSkia icon = *tp->GetImageSkiaNamed(id);
 
 #if defined(OS_WIN)
   // Keep track of whether we were showing the badge before, so we don't send
   // multiple UMA events for example when multiple Chrome windows are open.
   static bool incompatibility_badge_showing = false;
   // Save the old value before resetting it.
   bool was_showing = incompatibility_badge_showing;
   incompatibility_badge_showing = false;
 #endif
 
   int error_badge_id = GlobalErrorServiceFactory::GetForProfile(
       browser_->profile())->GetFirstBadgeResourceID();
 
   bool add_badge = ShouldShowUpgradeRecommended() ||
                    ShouldShowIncompatibilityWarning() || error_badge_id;
   if (!add_badge)
     return icon;
 
   // Draw the chrome app menu icon onto the canvas.
   scoped_ptr<gfx::Canvas> canvas(new gfx::Canvas(icon, false));
 
-  SkBitmap badge;
+  gfx::ImageSkia badge;
   // Only one badge can be active at any given time. The Upgrade notification
   // is deemed most important, then the DLL conflict badge.
   if (ShouldShowUpgradeRecommended()) {
-    badge = *tp->GetBitmapNamed(
+    badge = *tp->GetImageSkiaNamed(
         UpgradeDetector::GetInstance()->GetIconResourceID(
             UpgradeDetector::UPGRADE_ICON_TYPE_BADGE));
   } else if (ShouldShowIncompatibilityWarning()) {
 #if defined(OS_WIN)
     if (!was_showing)
       content::RecordAction(UserMetricsAction("ConflictBadge"));
-    badge = *tp->GetBitmapNamed(IDR_CONFLICT_BADGE);
+    badge = *tp->GetImageSkiaNamed(IDR_CONFLICT_BADGE);
     incompatibility_badge_showing = true;
 #else
     NOTREACHED();
 #endif
   } else if (error_badge_id) {
-    badge = *tp->GetBitmapNamed(error_badge_id);
+    badge = *tp->GetImageSkiaNamed(error_badge_id);
   } else {
     NOTREACHED();
   }
 
   canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin);
 
   return canvas->ExtractBitmap();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 196 matching lines @@
     int min_width = kLeftEdgeSpacing +
         back_->GetPreferredSize().width() + kButtonSpacing +
         forward_->GetPreferredSize().width() + kButtonSpacing +
         reload_->GetPreferredSize().width() + kStandardSpacing +
         (show_home_button_.GetValue() ?
             (home_->GetPreferredSize().width() + kButtonSpacing) : 0) +
         location_bar_->GetPreferredSize().width() +
         browser_actions_->GetPreferredSize().width() +
         app_menu_->GetPreferredSize().width() + kRightEdgeSpacing;
 
-    CR_DEFINE_STATIC_LOCAL(SkBitmap, normal_background, ());
+    CR_DEFINE_STATIC_LOCAL(gfx::ImageSkia, normal_background, ());
     if (normal_background.isNull()) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-      normal_background = *rb.GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
+      normal_background = *rb.GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
     }
 
     return gfx::Size(min_width,
                      normal_background.height() - kContentShadowHeight);
   }
 
   int vertical_spacing = PopupTopSpacing() +
       (GetWidget()->ShouldUseNativeFrame() ?
           kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass);
   return gfx::Size(0, location_bar_->GetPreferredSize().height() +
@@ skipping 260 matching lines @@
     accname_app = l10n_util::GetStringFUTF16(
         IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
   }
   app_menu_->SetAccessibleName(accname_app);
 
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
   SchedulePaint();
 }