chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm - Issue 10656014: Merge 143605 - grd file update for new 2x assets

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/content_settings/collected_cookies_mac.mm

Issue 10656014: Merge 143605 - grd file update for new 2x assets (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/

Patch Set: Created 8 years, 6 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/content_settings/collected_cookies_mac.mm

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

--- chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm (revision 143847)

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

@@ -33,7 +33,7 @@

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_source.h"

#include "grit/generated_resources.h"

-#include "grit/theme_resources.h"

+#include "grit/theme_resources_standard.h"

#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"

#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"

#include "third_party/apple_sample_code/ImageAndTextCell.h"