chrome/browser/ui/views/wrench_menu.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/wrench_menu.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/ui/views/wrench_menu.cc

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

index 753e80f3a1205fc5f0f5c47be743d1b436ac9fa8..0541196ea0e716d3d95846fae61b198ca73e1c87 100644

--- a/chrome/browser/ui/views/wrench_menu.cc

+++ b/chrome/browser/ui/views/wrench_menu.cc

@@ -426,7 +426,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView,

fullscreen_button_ = new FullscreenButton(this);

fullscreen_button_->SetImage(

ImageButton::BS_NORMAL,

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

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

IDR_FULLSCREEN_MENU_BUTTON));

fullscreen_button_->set_focusable(true);

fullscreen_button_->set_request_focus_on_press(false);

« no previous file with comments | « chrome/browser/ui/views/web_intent_picker_views.cc ('k') | ui/views/controls/button/image_button.h » ('j') | no next file with comments »