chrome/browser/safe_browsing/safe_browsing_blocking_page.cc - Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace.

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/safe_browsing/safe_browsing_blocking_page.cc

Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@02_components_move

Patch Set: Merging the latest changes from trunk. Created 5 years, 1 month 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/safe_browsing/safe_browsing_api_handler.h ('K') | « chrome/browser/safe_browsing/safe_browsing_blocking_page.h ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc » ('j') | chrome/browser/safe_browsing/safe_browsing_database.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

index b684fabea0ff6bc0d2cd50804f7975141f408a91..9c31b74018a8a507b24012d600a82eee67067482 100644

--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

@@ -50,7 +50,7 @@ using content::OpenURLParams;

using content::Referrer;

using content::WebContents;

-namespace {

+namespace safe_browsing {

// For malware interstitial pages, we link the problematic URL to Google's

Nathan Parker 2015/11/05 22:00:53 Keep these in anon-namespace.

vakh (old account. dont use) 2015/11/07 01:22:56 Done.

// diagnostic page.

@@ -93,8 +93,6 @@ const char kReportPhishingErrorEnabled[] = "Enabled";

base::LazyInstance<SafeBrowsingBlockingPage::UnsafeResourceMap>

g_unsafe_resource_map = LAZY_INSTANCE_INITIALIZER;

-} // namespace

// static

SafeBrowsingBlockingPageFactory* SafeBrowsingBlockingPage::factory_ = NULL;

@@ -716,3 +714,5 @@ void SafeBrowsingBlockingPage::PopulatePhishingLoadTimeData(

PopulateExtendedReportingOption(load_time_data);

}

+} // namespace safe_browsing