chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.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/bookmarks/bookmark_bar_controller.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/bookmarks/bookmark_all_tabs_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

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

index 9c745b4ec4bf7cf1329c9cdd2878d9c2955d2e0e..07fe0ceec27f60f50e8f0cc553e7370e71751c29 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

@@ -48,6 +48,7 @@

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

#include "components/bookmarks/browser/bookmark_model.h"

#include "components/bookmarks/browser/bookmark_node_data.h"

#include "components/bookmarks/browser/bookmark_utils.h"

@@ -56,7 +57,6 @@

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_set.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#import "ui/base/cocoa/cocoa_base_utils.h"

#include "ui/base/l10n/l10n_util_mac.h"