chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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

« no previous file with comments | « chrome/browser/ui/cocoa/confirm_quit_panel_controller.mm ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

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

index 7ae9a01b4d81880aabba08d3a715b13619ff655d..bd2a75025beaa2db7d4e29b775df0cdbac64dde9 100644

--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

@@ -22,10 +22,10 @@

#import "chrome/browser/ui/cocoa/vertical_gradient_view.h"

#include "chrome/browser/ui/collected_cookies_infobar_delegate.h"

#include "chrome/common/pref_names.h"

+#include "chrome/grit/generated_resources.h"

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

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

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

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "third_party/apple_sample_code/ImageAndTextCell.h"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"