Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: chrome/browser/chromeos/options/wifi_config_view.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/options/wifi_config_view.cc
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 91ce38ec1fa8b3511cd622e33221a8ab0ced3c72..6dbb85e733fc02cd1f40d84d63df844937919f43 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -1047,15 +1047,15 @@ void WifiConfigView::Init(WifiNetwork* wifi, bool show_8021x) {
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_);
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.cc ('k') | chrome/browser/chromeos/options/wimax_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698