components/error_page/common/localized_error.cc - Issue 2187473003: Remove #includes of "xxx_google_chrome_strings.h".

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: components/error_page/common/localized_error.cc

Issue 2187473003: Remove #includes of "xxx_google_chrome_strings.h". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix bad merge Created 4 years, 5 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:

Index: components/error_page/common/localized_error.cc

diff --git a/components/error_page/common/localized_error.cc b/components/error_page/common/localized_error.cc

index cab2ae480ca718b96bfeb6ad37bb19f7dda99174..56ac72ad7fb344c5d8594eca9ae08ceca801fdef 100644

--- a/components/error_page/common/localized_error.cc

+++ b/components/error_page/common/localized_error.cc

@@ -23,7 +23,6 @@

#include "components/error_page/common/error_page_switches.h"

#include "components/error_page/common/net_error_info.h"

#include "components/strings/grit/components_chromium_strings.h"

-#include "components/strings/grit/components_google_chrome_strings.h"

#include "components/strings/grit/components_strings.h"

#include "components/url_formatter/url_formatter.h"

#include "net/base/escape.h"