chrome/browser/ui/views/location_bar/location_bar_view.cc - 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/views/location_bar/location_bar_view.cc

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/views/location_bar/keyword_hint_view.cc ('k') | chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc

diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc

index 4bbd4bbdb114da588aa852c9fc377b63e1fa2b18..17ccce0f9eab36c72742a5cc710cca78acb434b6 100644

--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc

+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -61,6 +61,7 @@

#include "chrome/browser/ui/zoom/zoom_controller.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

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

#include "components/search_engines/template_url.h"

#include "components/search_engines/template_url_service.h"

#include "components/translate/core/browser/language_state.h"

@@ -71,7 +72,6 @@

#include "extensions/common/feature_switch.h"

#include "extensions/common/permissions/permissions_data.h"

#include "grit/component_scaled_resources.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "ui/accessibility/ax_view_state.h"

#include "ui/base/dragdrop/drag_drop_types.h"