Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

chrome/browser/ui/views/frame/app_non_client_frame_view_aura.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/frame/app_non_client_frame_view_aura.h"
 
 #include "base/debug/stack_trace.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"  // Accessibility names
@@ skipping 52 matching lines @@
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
     restore_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_MAXIMIZE));
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     int control_base_resource_id = owner->browser_view()->IsOffTheRecord() ?
         IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_ACTIVE :
         IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
-    control_base_ = rb.GetImageNamed(control_base_resource_id).ToSkBitmap();
+    control_base_ = rb.GetImageNamed(control_base_resource_id).ToImageSkia();
 
     separator_ =
-        rb.GetImageNamed(IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR).ToSkBitmap();
-    shadow_ = rb.GetImageNamed(IDR_AURA_WINDOW_FULLSCREEN_SHADOW).ToSkBitmap();
+        rb.GetImageNamed(IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR).ToImageSkia();
+    shadow_ = rb.GetImageNamed(IDR_AURA_WINDOW_FULLSCREEN_SHADOW).ToImageSkia();
 
     AddChildView(close_button_);
     AddChildView(restore_button_);
   }
 
   virtual void Layout() OVERRIDE {
     restore_button_->SetPosition(gfx::Point(kShadowStart, 0));
     close_button_->SetPosition(gfx::Point(kShadowStart +
         restore_button_->width() - kButtonOverlap, 0));
   }
@@ skipping 41 matching lines @@
       owner_->Close();
     } else if (sender == restore_button_) {
       restore_button_->SetState(views::CustomButton::BS_NORMAL);
       owner_->Restore();
     }
   }
 
  private:
   // Sets images whose ids are passed in for each of the respective states
   // of |button|.
-  void SetButtonImages(views::ImageButton* button, int normal_bitmap_id,
-                       int hot_bitmap_id, int pushed_bitmap_id) {
+  void SetButtonImages(views::ImageButton* button, int normal_image_id,
+                       int hot_image_id, int pushed_image_id) {
     ui::ThemeProvider* theme_provider = GetThemeProvider();
     button->SetImage(views::CustomButton::BS_NORMAL,
-                     theme_provider->GetImageSkiaNamed(normal_bitmap_id));
+                     theme_provider->GetImageSkiaNamed(normal_image_id));
     button->SetImage(views::CustomButton::BS_HOT,
-                     theme_provider->GetImageSkiaNamed(hot_bitmap_id));
+                     theme_provider->GetImageSkiaNamed(hot_image_id));
     button->SetImage(views::CustomButton::BS_PUSHED,
-                     theme_provider->GetImageSkiaNamed(pushed_bitmap_id));
+                     theme_provider->GetImageSkiaNamed(pushed_image_id));
   }
 
   AppNonClientFrameViewAura* owner_;
   views::ImageButton* close_button_;
   views::ImageButton* restore_button_;
-  const SkBitmap* control_base_;
-  const SkBitmap* separator_;
-  const SkBitmap* shadow_;
+  const gfx::ImageSkia* control_base_;
+  const gfx::ImageSkia* separator_;
+  const gfx::ImageSkia* shadow_;
 
   DISALLOW_COPY_AND_ASSIGN(ControlView);
 };
 
 class AppNonClientFrameViewAura::Host : public views::MouseWatcherHost {
  public:
   explicit Host(AppNonClientFrameViewAura* owner) : owner_(owner) {}
   virtual ~Host() {}
 
   virtual bool Contains(
@@ skipping 146 matching lines @@
 bool AppNonClientFrameViewAura::IsShowingControls() const {
   return control_widget_ && control_widget_->IsVisible();
 }
 
 void AppNonClientFrameViewAura::Restore() {
   if (control_widget_)
     control_widget_->Close();
   mouse_watcher_.Stop();
   frame()->Restore();
 }