chrome/browser/ui/toolbar/toolbar_model_impl.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/toolbar/toolbar_model_impl.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: nit 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

« chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc ('K') | « chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc

diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc

index fe59d51a306a939e231b1dd3a1bf81da426a8928..af2de923ea2f4313f55c22a0adadbc42a3d14878 100644

--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc

+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc

@@ -18,6 +18,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

#include "components/google/core/browser/google_util.h"

#include "components/omnibox/autocomplete_input.h"

#include "components/omnibox/autocomplete_match.h"

@@ -29,7 +30,6 @@

#include "content/public/common/content_constants.h"

#include "content/public/common/ssl_status.h"

#include "grit/component_scaled_resources.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "net/base/net_util.h"

#include "net/cert/cert_status_flags.h"