chrome/browser/chromeos/options/network_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/network_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/network_config_view.cc

diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc

index 095e6333be48bf9b689f83042d9af29b1e50130a..535b8899b2ba9e86ad07a0e94dcf9023f18caa26 100644

--- a/chrome/browser/chromeos/options/network_config_view.cc

+++ b/chrome/browser/chromeos/options/network_config_view.cc

@@ -315,9 +315,9 @@ void ControlledSettingIndicatorView::OnMouseExited(

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);

« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »