Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

ash/wm/frame_painter.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 "ash/wm/frame_painter.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 540 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // FramePainter, private:
 
 void FramePainter::SetButtonImages(views::ImageButton* button,
                                    int normal_bitmap_id,
                                    int hot_bitmap_id,
                                    int pushed_bitmap_id) {
   ui::ThemeProvider* theme_provider = frame_->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));
 }
 
 int FramePainter::GetTitleOffsetX() const {
   return window_icon_ ?
       window_icon_->bounds().right() + kTitleIconOffsetX :
       kTitleNoIconOffsetX;
 }
 
 int FramePainter::GetHeaderOpacity(HeaderMode header_mode,
                                    int theme_frame_id,
@@ skipping 34 matching lines @@
   for (std::set<FramePainter*>::const_iterator it = instances_->begin();
        it != instances_->end();
        ++it) {
     FramePainter* painter = *it;
     if (IsVisibleNormalWindow(painter->window_))
       painter->frame_->non_client_view()->SchedulePaint();
   }
 }
 
 }  // namespace ash