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

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: Remove '// namespace safe_browsing' for a small fwd decl block. 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
« no previous file with comments | « chrome/browser/safe_browsing/ui_manager.h ('k') | chrome/browser/safe_browsing/ui_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..322e40173efcdbcf791c456116454f40322f2c5a 100644
--- a/chrome/browser/safe_browsing/ui_manager.cc
+++ b/chrome/browser/safe_browsing/ui_manager.cc
@@ -59,6 +59,8 @@ class WhitelistUrlSet : public base::SupportsUserData::Data {
} // namespace
+namespace safe_browsing {
+
// SafeBrowsingUIManager::UnsafeResource ---------------------------------------
SafeBrowsingUIManager::UnsafeResource::UnsafeResource()
@@ -118,12 +120,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 +337,5 @@ bool SafeBrowsingUIManager::IsWhitelisted(const UnsafeResource& resource) {
return false;
return site_list->Contains(maybe_whitelisted_url);
}
+
+} // namespace safe_browsing
« no previous file with comments | « chrome/browser/safe_browsing/ui_manager.h ('k') | chrome/browser/safe_browsing/ui_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698