chrome/browser/ssl/ssl_blocking_page.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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/ssl/ssl_blocking_page.cc

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (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

Index: chrome/browser/ssl/ssl_blocking_page.cc

diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc

index 61c2c2fa5106db596612306a74ae74dadbd3c2a1..2b5d04240c56116bfc466f321d65391877e2420b 100644

--- a/chrome/browser/ssl/ssl_blocking_page.cc

+++ b/chrome/browser/ssl/ssl_blocking_page.cc

@@ -24,6 +24,8 @@

#include "chrome/browser/ssl/ssl_error_classification.h"

#include "chrome/browser/ssl/ssl_error_info.h"

#include "chrome/common/chrome_switches.h"

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

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

#include "content/public/browser/cert_store.h"

#include "content/public/browser/interstitial_page.h"

#include "content/public/browser/navigation_controller.h"

@@ -36,8 +38,6 @@

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

#include "grit/app_locale_settings.h"

#include "grit/browser_resources.h"

-#include "grit/chromium_strings.h"

-#include "grit/generated_resources.h"

#include "net/base/hash_value.h"

#include "net/base/net_errors.h"

#include "net/base/net_util.h"

« no previous file with comments | « chrome/browser/ssl/ssl_add_certificate.cc ('k') | chrome/browser/ssl/ssl_error_info.cc » ('j') | no next file with comments »