chrome/browser/ui/views/frame/browser_frame_win.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/ui/views/frame/browser_frame_win.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

« no previous file with comments | « chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc ('k') | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_frame_win.cc

diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc

index 45430fadf521bb04710644daa98c740ce550c3f5..4f86cdcf2f2ca9d301796ede262e6e59a74b3aeb 100644

--- a/chrome/browser/ui/views/frame/browser_frame_win.cc

+++ b/chrome/browser/ui/views/frame/browser_frame_win.cc

@@ -70,7 +70,7 @@ views::Button* MakeWindowSwitcherButton(views::ButtonListener* listener) {

views::ImageButton* switcher_button = new views::ImageButton(listener);

switcher_button->SetImage(

views::ImageButton::BS_NORMAL,

- ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(

+ ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(

IDR_PAGEINFO_WARNING_MINOR));

// TODO(cpu): Replace IDR_PAGEINFO_WARNING_MINOR with actual image.

switcher_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER,