chrome/browser/ui/cocoa/toolbar/toolbar_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/toolbar/toolbar_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/toolbar/reload_button.mm ('k') | chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

index 561ec8c3f5cbaa48a68ae0bba1c78bfa4b31d0ff..1e05af741e7a07ddc6f425328e2a4a02a154c39b 100644

--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

@@ -45,13 +45,13 @@

#include "chrome/browser/ui/toolbar/wrench_menu_badge_controller.h"

#include "chrome/browser/ui/toolbar/wrench_menu_model.h"

#include "chrome/common/pref_names.h"

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

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

#include "components/metrics/proto/omnibox_event.pb.h"

#include "components/omnibox/autocomplete_match.h"

#include "components/search_engines/template_url_service.h"

#include "components/url_fixer/url_fixer.h"

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

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

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

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