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

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

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

index 08586ccd13d1ecec5c6f533306bb2de10e9b14ac..51ae544ad14de0335727ec3cf486e666c4ba8848 100644

--- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm

+++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm

@@ -10,8 +10,8 @@

#include "base/strings/string16.h"

#include "base/strings/sys_string_conversions.h"

#include "chrome/browser/search_engines/ui_thread_search_terms_data.h"

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

#include "components/search_engines/template_url.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"

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