Change SetImage, SetBackground, and SetToggledImage to take in a gfx::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 122 matching lines @@
     }
   }
 
  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) {
     ui::ThemeProvider* theme_provider = GetThemeProvider();
     button->SetImage(views::CustomButton::BS_NORMAL,
-                     theme_provider->GetBitmapNamed(normal_bitmap_id));
+                     theme_provider->GetImageSkiaNamed(normal_bitmap_id));
     button->SetImage(views::CustomButton::BS_HOT,
-                     theme_provider->GetBitmapNamed(hot_bitmap_id));
+                     theme_provider->GetImageSkiaNamed(hot_bitmap_id));
     button->SetImage(views::CustomButton::BS_PUSHED,
-                     theme_provider->GetBitmapNamed(pushed_bitmap_id));
+                     theme_provider->GetImageSkiaNamed(pushed_bitmap_id));
   }
 
   AppNonClientFrameViewAura* owner_;
   views::ImageButton* close_button_;
   views::ImageButton* restore_button_;
   const SkBitmap* control_base_;
   const SkBitmap* separator_;
   const SkBitmap* shadow_;
 
   DISALLOW_COPY_AND_ASSIGN(ControlView);
@@ skipping 154 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();
 }