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

ash/monitor/secondary_monitor_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/monitor/secondary_monitor_view.h"
 
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
@@ skipping 36 matching lines @@
 
     shortcut_text_ = new views::Label(
         l10n_util::GetStringUTF16(IDS_ASH_SECONDARY_MONITOR_SHORTCUT));
     shortcut_text_->SetAutoColorReadabilityEnabled(false);
     shortcut_text_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
     shortcut_text_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
     shortcut_text_->SetEnabledColor(kTextColor);
     AddChildView(shortcut_text_);
 
     shortcut_image_ = new views::ImageView();
-    shortcut_image_->SetImage(rb.GetBitmapNamed(IDR_AURA_SWITCH_MONITOR));
+    shortcut_image_->SetImage(rb.GetImageSkiaNamed(IDR_AURA_SWITCH_MONITOR));
     AddChildView(shortcut_image_);
   }
 
   virtual void Layout() {
     const int kMessagePositionTopMargin = 40;
     const int kShortcutPositionBottomMargin = 40;
     const int kShortcutMargin = 4;  // margin between text and image.
     gfx::Rect b = bounds();
 
     int msg_height = message_->GetHeightForWidth(b.width());
@@ skipping 34 matching lines @@
   params.delegate = view;
   params.parent = parent;
   desktop_widget->Init(params);
   desktop_widget->SetContentsView(view);
   desktop_widget->Show();
   desktop_widget->GetNativeView()->SetName("SecondaryMonitor");
   return desktop_widget;
 }
 
 }  // namespace ash