chrome/browser/ui/cocoa/browser/avatar_button_controller.mm - Issue 10916283: mac: use png otr icon asset instead of pdf

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/cocoa/browser/avatar_button_controller.mm

Issue 10916283: mac: use png otr icon asset instead of pdf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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:

Index: chrome/browser/ui/cocoa/browser/avatar_button_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm

index cd988a4410ace892349195066419a56b472cb915..10bc30237cb193f7dccb68e02d0d42cf0128a726 100644

--- a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm

+++ b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm

@@ -133,8 +133,9 @@ const CGFloat kMenuYOffsetAdjust = 1.0;

[self setView:button];

if (browser_->profile()->IsOffTheRecord()) {

- [self setImage:[self compositeImageWithShadow:

- gfx::GetCachedImageWithName(@"otr_icon.pdf")]];

+ gfx::Image otrIcon =

+ ResourceBundle::GetSharedInstance().GetNativeImageNamed(IDR_OTR_ICON);

+ [self setImage:[self compositeImageWithShadow:otrIcon]];

Robert Sesek 2012/09/13 13:17:55 Use .ToNSImage(). The operator is deprecated.

Nico 2012/09/14 02:08:39 Done.

[self setButtonEnabled:NO];

} else {

[self setButtonEnabled:YES];

« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »