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

ash/wm/dialog_frame_view.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/dialog_frame_view.h"
 
 #include "grit/ui_resources_standard.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ skipping 54 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // DialogFrameView, public:
 
 DialogFrameView::DialogFrameView() {
   set_background(views::Background::CreateSolidBackground(
       kDialogBackgroundColor));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
-      rb.GetImageNamed(IDR_CLOSE_BAR).ToSkBitmap());
+      rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());
   close_button_->SetImage(views::CustomButton::BS_HOT,
-      rb.GetImageNamed(IDR_CLOSE_BAR_H).ToSkBitmap());
+      rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
-      rb.GetImageNamed(IDR_CLOSE_BAR_P).ToSkBitmap());
+      rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
   close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                    views::ImageButton::ALIGN_MIDDLE);
   AddChildView(close_button_);
 }
 
 DialogFrameView::~DialogFrameView() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogFrameView, views::NonClientFrameView:
@@ skipping 96 matching lines @@
       GetTitleFont().GetHeight() + GetTitleFont().GetFontSize() -
           kDialogTopPaddingNudge,
       -kDialogHPaddingNudge,
       -kDialogBottomPaddingNudge,
       -kDialogHPaddingNudge);
   return insets;
 }
 
 }  // namespace internal
 }  // namespace views