chrome/browser/chromeos/options/wifi_config_view.cc - Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« ash/system/audio/tray_volume.cc ('K') | « chrome/browser/chromeos/options/network_config_view.cc ('k') | chrome/browser/first_run/try_chrome_dialog_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e07d3091b9f1ab2375b19b59f816c06a4dad0e0d..1c3ebd42e805b4f8c0033e1abb1067b8fa274d96 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_);