chrome/browser/ui/cocoa/browser_window_controller.mm - Issue 5961007: Move nsimage_cache from base to app/mac. Use the app::mac namespace. Update c...

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_window_controller.mm

Issue 5961007: Move nsimage_cache from base to app/mac. Use the app::mac namespace. Update c... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years 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

« chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | chrome/browser/ui/cocoa/tab_strip_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- chrome/browser/ui/cocoa/browser_window_controller.mm (revision 69953)

+++ chrome/browser/ui/cocoa/browser_window_controller.mm (working copy)

@@ -8,9 +8,9 @@

#include "app/l10n_util.h"

#include "app/l10n_util_mac.h"

+#include "app/mac/scoped_nsdisable_screen_updates.h"

+#include "app/mac/nsimage_cache.h"

#include "base/mac_util.h"

-#include "app/mac/scoped_nsdisable_screen_updates.h"

-#include "base/nsimage_cache_mac.h"

#import "base/scoped_nsobject.h"

#include "base/sys_string_conversions.h"

#include "chrome/app/chrome_command_ids.h" // IDC_*

@@ -1583,7 +1583,7 @@

// Install the image into the badge view and size the view appropriately.

// Hide it for now; positioning and showing will be done by the layout code.

- NSImage* image = nsimage_cache::ImageNamed(@"otr_icon.pdf");

+ NSImage* image = app::mac::GetCachedImageWithName(@"otr_icon.pdf");

incognitoBadge_.reset([[IncognitoImageView alloc] init]);

[incognitoBadge_ setImage:image];

[incognitoBadge_ setFrameSize:[image size]];