Revert 139776 - Convert ash and chromeos parts of chrome/ to ImageSkia

Used same conversion script as 10437006

Changed by hand afterwards:
  1 ash/shell/app_list.cc
  2 ash/shell/content_client/shell_content_browser_client.h
  3 ash/shell/window_watcher.cc
  4 ash/system/tray/tray_views.h
  5 ash/system/user/tray_user.cc
  6 ash/test/test_launcher_delegate.cc
  7 ash/wm/frame_painter.cc
  8 ash/wm/image_grid_unittest.cc
  9 chrome/browser/chrome_content_browser_client.cc
 10 chrome/browser/chrome_content_browser_client.h
 11 chrome/browser/chromeos/extensions/file_manager_util.cc
 12 chrome/browser/chromeos/login/message_bubble.h
 13 chrome/browser/chromeos/login/take_photo_view.cc
 14 chrome/browser/chromeos/login/take_photo_view.h
 15 chrome/browser/chromeos/login/user.h
 16 chrome/browser/chromeos/login/user_image_screen.cc
 17 chrome/browser/chromeos/login/user_image_screen_actor.h
 18 chrome/browser/chromeos/login/webui_login_view.cc
 19 chrome/browser/chromeos/options/take_photo_dialog.cc
 20 chrome/browser/chromeos/status/data_promo_notification.cc
 21 chrome/browser/chromeos/status/network_menu_icon.cc
 22 chrome/browser/chromeos/status/network_menu_icon.h
 23 chrome/browser/chromeos/status/network_menu_icon_unittest.cc
 24 chrome/browser/debugger/devtools_window.cc
 25 chrome/browser/favicon/favicon_handler.cc
 26 chrome/browser/favicon/favicon_tab_helper.cc
 27 chrome/browser/instant/instant_loader.cc
 28 chrome/browser/ui/toolbar/back_forward_menu_model.cc
 29 chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
 30 chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
 31 chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h
 32 chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc
 33 chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.h
 34 chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.h
 35 chrome/browser/ui/webui/options2/chromeos/user_image_source2.cc
 36 chrome/browser/ui/webui/options2/chromeos/wallpaper_thumbnail_source2.cc
 37 content/browser/mock_content_browser_client.cc
 38 content/browser/mock_content_browser_client.h
 39 content/public/browser/content_browser_client.h
 40 content/public/browser/favicon_status.cc
 41 content/public/browser/favicon_status.h
 42 content/shell/shell_content_browser_client.cc
 43 content/shell/shell_content_browser_client.h
 44 ui/views/examples/content_client/examples_content_browser_client.cc
 45 ui/views/examples/content_client/examples_content_browser_client.h

Fixed headers and spacing
 1 ash/desktop_background/desktop_background_controller.cc
 2 ash/desktop_background/desktop_background_controller.h
 3 ash/desktop_background/desktop_background_resources.cc
 4 ash/desktop_background/desktop_background_resources.h
 5 ash/shell.h
 6 ash/shell_factory.h
 7 ash/system/tray/system_tray_delegate.h
 8 ash/wm/frame_painter.h
 9 chrome/browser/chromeos/login/default_user_images.h
 10 chrome/browser/chromeos/status/network_menu.cc

Test=Compiles
Bug=124566

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

TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10456054

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

1 files changed, 5 insertions, 5 deletions

diff --git a/ash/system/power/tray_power.cc b/ash/system/power/tray_power.cc
index 48b206e..4d7b8ae 100644
--- a/ash/system/power/tray_power.cc
+++ b/ash/system/power/tray_power.cc
@@ -17,12 +17,12 @@
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkRect.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
@@ -58,9 +58,9 @@ enum IconSet {
   ICON_DARK
 };
 
-gfx::ImageSkia GetBatteryImage(const PowerSupplyStatus& supply_status,
+SkBitmap GetBatteryImage(const PowerSupplyStatus& supply_status,
                          IconSet icon_set) {
-  gfx::ImageSkia image;
+  SkBitmap image;
   gfx::Image all = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
       icon_set == ICON_DARK ?
       IDR_AURA_UBER_TRAY_POWER_SMALL_DARK : IDR_AURA_UBER_TRAY_POWER_SMALL);
@@ -83,7 +83,7 @@ gfx::ImageSkia GetBatteryImage(const PowerSupplyStatus& supply_status,
       (supply_status.line_power_on ? kBatteryImageWidth : 0) + 2,
       image_index * kBatteryImageHeight,
       kBatteryImageWidth - 2, kBatteryImageHeight);
-  all.ToImageSkia()->extractSubset(&image, region);
+  all.ToSkBitmap()->extractSubset(&image, region);
   return image;
 }