chrome/browser/ui/cocoa/tab_strip_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/tab_strip_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/search_engine_dialog_controller.mm ('k') | chrome/browser/ui/cocoa/tab_view.mm » ('j') | chrome/browser/ui/cocoa/toolbar_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

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

@@ -10,9 +10,9 @@

#include <string>

#include "app/l10n_util.h"

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

#include "app/resource_bundle.h"

#include "base/mac_util.h"

-#include "base/nsimage_cache_mac.h"

#include "base/sys_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/autocomplete/autocomplete.h"

@@ -316,9 +316,9 @@

[newTabButton_ setTag:IDC_NEW_TAB];

// Set the images from code because Cocoa fails to find them in our sub

// bundle during tests.

- [newTabButton_ setImage:nsimage_cache::ImageNamed(kNewTabImage)];

- [newTabButton_

- setAlternateImage:nsimage_cache::ImageNamed(kNewTabPressedImage)];

+ [newTabButton_ setImage:app::mac::GetCachedImageWithName(kNewTabImage)];

+ [newTabButton_ setAlternateImage:app::mac::GetCachedImageWithName(

+ kNewTabPressedImage)];

Avi (use Gerrit) 2010/12/22 19:06:38 Awkward break; better is breaking after setAlterna

newTabButtonShowingHoverImage_ = NO;

newTabTrackingArea_.reset(

[[NSTrackingArea alloc] initWithRect:[newTabButton_ bounds]

@@ -1590,10 +1590,11 @@

- (void)setNewTabButtonHoverState:(BOOL)shouldShowHover {

if (shouldShowHover && !newTabButtonShowingHoverImage_) {

newTabButtonShowingHoverImage_ = YES;

- [newTabButton_ setImage:nsimage_cache::ImageNamed(kNewTabHoverImage)];

+ [newTabButton_

+ setImage:app::mac::GetCachedImageWithName(kNewTabHoverImage)];

Avi (use Gerrit) 2010/12/22 19:06:38 Ditto; a cleaner break is after setImage:

} else if (!shouldShowHover && newTabButtonShowingHoverImage_) {

newTabButtonShowingHoverImage_ = NO;

- [newTabButton_ setImage:nsimage_cache::ImageNamed(kNewTabImage)];

+ [newTabButton_ setImage:app::mac::GetCachedImageWithName(kNewTabImage)];

}