Converted the rest of chrome except for extensions and favicons to user ImageSkia

Used same conversion script as 10437006

Modified the following files afterwards:
  1 chrome/browser/background/background_application_list_model.cc
  2 chrome/browser/extensions/extension_install_ui.cc
  3 chrome/browser/extensions/extension_install_ui.h
  4 chrome/browser/speech/speech_recognition_bubble.cc
  5 chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc
  6 chrome/browser/speech/speech_recognition_bubble_gtk.cc
  7 chrome/browser/speech/speech_recognition_tray_icon_controller.h
  8 chrome/browser/task_manager/task_manager_resource_providers.cc
  9 chrome/browser/ui/panels/panel_browser_frame_view.cc
 10 chrome/browser/ui/search_engines/template_url_table_model.cc
 11 chrome/browser/ui/search_engines/template_url_table_model.h
 12 chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
 13 chrome/browser/ui/views/avatar_menu_button.cc
 14 chrome/browser/ui/views/detachable_toolbar_view.cc
 15 chrome/browser/ui/views/download/download_item_view.cc
 16 chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
 17 chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
 18 chrome/browser/ui/views/location_bar/location_bar_view.cc
 19 chrome/browser/ui/views/tab_icon_view.cc
 20 chrome/browser/ui/views/tab_icon_view.h
 21 chrome/browser/ui/views/tabs/tab_strip.cc

Include, whitespace changes in
  1 chrome/browser/automation/automation_provider_observers.cc
  2 chrome/browser/background/background_application_list_model.h
  3 chrome/browser/background/background_mode_manager.cc
  4 chrome/browser/custom_home_pages_table_model.h
  5 chrome/browser/download/download_util.cc
  6 chrome/browser/extensions/extension_function_dispatcher.cc
  7 chrome/browser/extensions/extension_install_dialog.cc
  8 chrome/browser/extensions/extension_install_dialog.h
  9 chrome/browser/ntp_background_util.cc
 10 chrome/browser/speech/speech_recognition_bubble.h
 11 chrome/browser/task_manager/task_manager.h
 12 chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc
 13 chrome/browser/ui/cocoa/infobars/mock_link_infobar_delegate.cc
 14 chrome/browser/ui/cocoa/task_manager_mac.h
 15 chrome/browser/ui/views/about_chrome_view.cc
 16 chrome/browser/ui/views/avatar_menu_bubble_view.cc
 17 chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
 18 chrome/browser/ui/views/download/download_item_view.h
 19 chrome/browser/ui/views/find_bar_view.cc
 20 chrome/browser/ui/views/infobars/extension_infobar.cc
 21 chrome/browser/ui/views/notifications/balloon_view.cc
 22 chrome/browser/ui/views/page_info_bubble_view.cc
 23 chrome/browser/ui/views/tabs/base_tab.cc
 24 chrome/browser/ui/views/tabs/tab.cc
 25 chrome/browser/ui/views/toolbar_view.cc

Review URL: https://chromiumcodereview.appspot.com/10453101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140531 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 18 insertions, 13 deletions

diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc
index 6965c6b..3501404 100644
--- a/chrome/browser/background/background_application_list_model.cc
+++ b/chrome/browser/background/background_application_list_model.cc
@@ -10,9 +10,9 @@
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
+#include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -26,6 +26,7 @@
 #include "content/public/browser/notification_source.h"
 #include "ui/base/l10n/l10n_util_collator.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 
 using extensions::Extension;
 using extensions::ExtensionList;
@@ -72,7 +73,7 @@ class BackgroundApplicationListModel::Application
   void RequestIcon(ExtensionIconSet::Icons size);
 
   const Extension* extension_;
-  scoped_ptr<SkBitmap> icon_;
+  scoped_ptr<gfx::ImageSkia> icon_;
   BackgroundApplicationListModel* model_;
   ImageLoadingTracker tracker_;
 };
@@ -146,7 +147,7 @@ void BackgroundApplicationListModel::Application::OnImageLoaded(
     int index) {
   if (image.IsEmpty())
     return;
-  icon_.reset(image.CopySkBitmap());
+  icon_.reset(image.CopyImageSkia());
   model_->SendApplicationDataChangedNotifications(extension_);
 }
 
@@ -240,7 +241,7 @@ BackgroundApplicationListModel::FindApplication(
   return (found == applications_.end()) ? NULL : found->second;
 }
 
-const SkBitmap* BackgroundApplicationListModel::GetIcon(
+const gfx::ImageSkia* BackgroundApplicationListModel::GetIcon(
     const Extension* extension) {
   const Application* application = FindApplication(extension);
   if (application)
diff --git a/chrome/browser/background/background_application_list_model.h b/chrome/browser/background/background_application_list_model.h
index c4f6a45..f38a767 100644
--- a/chrome/browser/background/background_application_list_model.h
+++ b/chrome/browser/background/background_application_list_model.h
@@ -17,6 +17,10 @@
 
 class Profile;
 
+namespace gfx {
+class ImageSkia;
+}
+
 // Model for list of Background Applications associated with a Profile (i.e.
 // extensions with kBackgroundPermission set, or hosted apps with a
 // BackgroundContents).
@@ -55,11 +59,11 @@ class BackgroundApplicationListModel : public content::NotificationObserver {
   // that there is no icon associated with the extension, or that a pending
   // task to retrieve the icon has not completed.  See the Observer class above.
   //
-  // NOTE: The model manages the SkBitmap result, that is it "owns" the memory,
+  // NOTE: The model manages the ImageSkia result, that is it "owns" the memory,
   //       releasing it if the associated background application is unloaded.
   // NOTE: All icons are currently sized as
   //       ExtensionIconSet::EXTENSION_ICON_BITTY.
-  const SkBitmap* GetIcon(const extensions::Extension* extension);
+  const gfx::ImageSkia* GetIcon(const extensions::Extension* extension);
 
   // Return the position of |extension| within this list model.
   int GetPosition(const extensions::Extension* extension) const;
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index 76d079d..e5c5314 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -117,7 +117,7 @@ void BackgroundModeManager::BackgroundModeData::BuildProfileMenu(
              applications_->begin();
          cursor != applications_->end();
          ++cursor, ++position) {
-      const SkBitmap* icon = applications_->GetIcon(*cursor);
+      const gfx::ImageSkia* icon = applications_->GetIcon(*cursor);
       DCHECK(position == applications_->GetPosition(*cursor));
       const std::string& name = (*cursor)->name();
       menu->AddItem(position, UTF8ToUTF16(name));
@@ -663,9 +663,9 @@ void BackgroundModeManager::CreateStatusTrayIcon() {
 
   // Set the image and add ourselves as a click observer on it.
   // TODO(rlp): Status tray icon should have submenus for each profile.
-  SkBitmap* bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
-      IDR_STATUS_TRAY_ICON);
-  status_icon_->SetImage(*bitmap);
+  gfx::ImageSkia* image_skia = ResourceBundle::GetSharedInstance().
+      GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
+  status_icon_->SetImage(*image_skia);
   status_icon_->SetToolTip(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   UpdateStatusTrayIconContextMenu();
 }
diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc
index 33b79e2..6c4eabf 100644
--- a/chrome/browser/background/background_mode_manager_win.cc
+++ b/chrome/browser/background/background_mode_manager_win.cc
@@ -11,13 +11,13 @@
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/browser/background/background_mode_manager.h"
-#include "chrome/installer/util/auto_launch_util.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/installer/util/auto_launch_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image/image_skia.h"
 
 using content::BrowserThread;
 
@@ -38,7 +38,7 @@ void BackgroundModeManager::DisplayAppInstalledNotification(
   // a background app has been installed.
   CreateStatusTrayIcon();
   status_icon_->DisplayBalloon(
-      SkBitmap(),
+      gfx::ImageSkia(),
       l10n_util::GetStringUTF16(IDS_BACKGROUND_APP_INSTALLED_BALLOON_TITLE),
       l10n_util::GetStringFUTF16(
           IDS_BACKGROUND_APP_INSTALLED_BALLOON_BODY,