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

chrome/browser/chromeos/options/network_config_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 "chrome/browser/chromeos/options/network_config_view.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 297 matching lines @@
   image_view_->SetImage(color_image_);
 }
 
 void ControlledSettingIndicatorView::OnMouseExited(
     const views::MouseEvent& event) {
   image_view_->SetImage(gray_image_);
 }
 
 void ControlledSettingIndicatorView::Init() {
   color_image_ = ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_CONTROLLED_SETTING_MANDATORY).ToSkBitmap();
+      IDR_CONTROLLED_SETTING_MANDATORY).ToImageSkia();
   gray_image_ = ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_CONTROLLED_SETTING_MANDATORY_GRAY).ToSkBitmap();
+      IDR_CONTROLLED_SETTING_MANDATORY_GRAY).ToImageSkia();
   image_view_ = new views::ImageView();
   // Disable |image_view_| so mouse events propagate to the parent.
   image_view_->SetEnabled(false);
   image_view_->SetImage(gray_image_);
   image_view_->SetTooltipText(
       l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_POLICY));
   AddChildView(image_view_);
 }
 
 }  // namespace chromeos