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

chrome/browser/chromeos/options/wimax_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/wimax_config_view.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 256 matching lines @@
     passphrase_visible_button_ = new views::ToggleImageButton(this);
     passphrase_visible_button_->SetTooltipText(
         l10n_util::GetStringUTF16(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_SHOW));
     passphrase_visible_button_->SetToggledTooltipText(
         l10n_util::GetStringUTF16(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE_HIDE));
     passphrase_visible_button_->SetImage(
         views::ImageButton::BS_NORMAL,
         ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_NETWORK_SHOW_PASSWORD_OFF));
+        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_OFF));
     passphrase_visible_button_->SetImage(
         views::ImageButton::BS_HOT,
         ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_NETWORK_SHOW_PASSWORD_HOVER));
+        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_HOVER));
     passphrase_visible_button_->SetToggledImage(
         views::ImageButton::BS_NORMAL,
         ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_NETWORK_SHOW_PASSWORD_ON));
+        GetImageSkiaNamed(IDR_NETWORK_SHOW_PASSWORD_ON));
     passphrase_visible_button_->SetImageAlignment(
         views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE);
     layout->AddView(passphrase_visible_button_);
   }
 
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Checkboxes.
 
   // Save credentials
@@ skipping 31 matching lines @@
   UpdateErrorLabel();
 }
 
 void WimaxConfigView::InitFocus() {
   views::View* view_to_focus = GetInitiallyFocusedView();
   if (view_to_focus)
     view_to_focus->RequestFocus();
 }
 
 }  // namespace chromeos