chrome/browser/ui/website_settings/website_settings.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: chrome/browser/ui/website_settings/website_settings.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: chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index 5853d3e4094cda5b3bf438ef21ed1433af29b61d..ad39bb6d1194537cca56ba2c07ff5397d1291a2a 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -60,7 +60,6 @@

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

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

#include "grit/components_chromium_strings.h"

-#include "grit/components_google_chrome_strings.h"

#include "grit/components_strings.h"

#include "net/cert/cert_status_flags.h"

#include "net/cert/x509_certificate.h"