Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: chrome/browser/safe_browsing/ui_manager.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
Index: chrome/browser/safe_browsing/ui_manager.cc
diff --git a/chrome/browser/safe_browsing/ui_manager.cc b/chrome/browser/safe_browsing/ui_manager.cc
index b33db7a4f457e21750fff93be6493b835922a56b..6d80e9878521ca83f7d0c23e2603f531b3a7f452 100644
--- a/chrome/browser/safe_browsing/ui_manager.cc
+++ b/chrome/browser/safe_browsing/ui_manager.cc
@@ -36,7 +36,7 @@ using content::BrowserThread;
using content::NavigationEntry;
using content::WebContents;
-namespace {
+namespace safe_browsing {
Nathan Parker 2015/11/05 22:00:53 anon-namespace
vakh (old account. dont use) 2015/11/07 01:22:57 Done.
const void* const kWhitelistKey = &kWhitelistKey;
@@ -57,8 +57,6 @@ class WhitelistUrlSet : public base::SupportsUserData::Data {
DISALLOW_COPY_AND_ASSIGN(WhitelistUrlSet);
};
-} // namespace
-
// SafeBrowsingUIManager::UnsafeResource ---------------------------------------
SafeBrowsingUIManager::UnsafeResource::UnsafeResource()
@@ -118,12 +116,12 @@ void SafeBrowsingUIManager::DisplayBlockingPage(
// applied to malware sites tagged as "landing sites" (see "Types of
// Malware sites" under
// https://developers.google.com/safe-browsing/developers_guide_v3#UserWarnings).
- safe_browsing::MalwarePatternType proto;
+ MalwarePatternType proto;
if (resource.threat_type == SB_THREAT_TYPE_URL_UNWANTED ||
(resource.threat_type == SB_THREAT_TYPE_URL_MALWARE &&
!resource.threat_metadata.empty() &&
proto.ParseFromString(resource.threat_metadata) &&
- proto.pattern_type() == safe_browsing::MalwarePatternType::LANDING)) {
+ proto.pattern_type() == MalwarePatternType::LANDING)) {
if (!resource.callback.is_null()) {
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE, base::Bind(resource.callback, true));
@@ -335,3 +333,5 @@ bool SafeBrowsingUIManager::IsWhitelisted(const UnsafeResource& resource) {
return false;
return site_list->Contains(maybe_whitelisted_url);
}
+
+} // namespace safe_browsing

Powered by Google App Engine
This is Rietveld 408576698