ash/monitor/secondary_monitor_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: ash/monitor/secondary_monitor_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: ash/monitor/secondary_monitor_view.cc

diff --git a/ash/monitor/secondary_monitor_view.cc b/ash/monitor/secondary_monitor_view.cc

index 46e9bf8aac07f3f33fb33f814b0ca84072774b28..ad9b250ab44f2f39cc48909f4a50879c5070ec17 100644

--- a/ash/monitor/secondary_monitor_view.cc

+++ b/ash/monitor/secondary_monitor_view.cc

@@ -54,7 +54,7 @@ class SecondaryMonitorView : public views::WidgetDelegateView {

AddChildView(shortcut_text_);

shortcut_image_ = new views::ImageView();

- shortcut_image_->SetImage(rb.GetBitmapNamed(IDR_AURA_SWITCH_MONITOR));

+ shortcut_image_->SetImage(rb.GetImageSkiaNamed(IDR_AURA_SWITCH_MONITOR));

AddChildView(shortcut_image_);

}

« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/system/audio/tray_volume.cc » ('j') | no next file with comments »