Support manual (white|black)list, previewing and allowing after interstitial

chrome/browser/managed_mode/managed_mode.cc

Index: chrome/browser/managed_mode/managed_mode.cc
diff --git a/chrome/browser/managed_mode/managed_mode.cc b/chrome/browser/managed_mode/managed_mode.cc
index 0f0014f32ebc5ee6a8794c540226e26f596f4ac8..dae3dbf4cdb7b3c61a9fdcf9acf1e8e7048245d6 100644
--- a/chrome/browser/managed_mode/managed_mode.cc
+++ b/chrome/browser/managed_mode/managed_mode.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/managed_mode/managed_mode_url_filter.h"
 #include "chrome/browser/policy/url_blacklist_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -75,24 +76,22 @@ class ManagedMode::URLFilterContext {
                                       base::Bind(&base::DoNothing)));
   }
 
-  void AddStringToManualWhitelist(const std::string& url) {
+  void AddURLPatternToManualWhitelist(const std::string& url) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     task_runner_->PostTask(FROM_HERE,
-                           base::Bind(
-                             &ManagedModeURLFilter::AddStringToManualWhitelist,
-                             base::Unretained(&url_filter_),
-                             url,
-                             base::Bind(&base::DoNothing)));
+        base::Bind(&ManagedModeURLFilter::AddURLPatternToManualWhitelist,
+                   base::Unretained(&url_filter_),
+                   url,
+                   base::Bind(&base::DoNothing)));
   }
 
-  void AddStringToManualBlacklist(const std::string& url) {
+  void AddURLPatternToManualBlacklist(const std::string& url) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     task_runner_->PostTask(FROM_HERE,
-                           base::Bind(
-                             &ManagedModeURLFilter::AddStringToManualBlacklist,
-                             base::Unretained(&url_filter_),
-                             url,
-                             base::Bind(&base::DoNothing)));
+        base::Bind(&ManagedModeURLFilter::AddURLPatternToManualBlacklist,
+                   base::Unretained(&url_filter_),
+                   url,
+                   base::Bind(&base::DoNothing)));
   }
 
   void ShutdownOnUIThread() {
@@ -261,18 +260,45 @@ void ManagedMode::GetCategoryNames(CategoryList* list) {
   ManagedModeSiteList::GetCategoryNames(list);
 };
 
+bool ManagedMode::AddToManualWhitelist(const base::ListValue& whitelist) {
+  return GetInstance()->AddToManualWhitelistImpl(whitelist);
+}
+
 // static

[Bernhard Bauer, 2012/11/27 18:44:46]

This method isn't static. The one above is :-p

[Sergiu, 2012/11/28 12:53:25]

Done.

-scoped_ptr<base::ListValue> ManagedMode::GetWhitelist() {
-  // XXX Is this ok? GetList returns a const and we need non-const
-  return scoped_ptr<base::ListValue>(
-      GetInstance()->managed_profile_->GetPrefs()->GetList(
-          prefs::kManagedModeWhitelist)->DeepCopy()).Pass();
+bool ManagedMode::AddToManualWhitelistImpl(const base::ListValue& whitelist) {
+  ListPrefUpdate pref_update(managed_profile_->GetPrefs(),
+                             prefs::kManagedModeWhitelist);
+  ListValue* pref_whitelist = pref_update.Get();
+
+  bool added_last_url = true;
+  // Count as ListValues don't have a .back() member.
+  unsigned int position = 0;

[Bernhard Bauer, 2012/11/27 18:44:46]

Hm, we might simply do a regular for-loop with a size_t instead.

[Sergiu, 2012/11/28 12:53:25]

Done.

+  for (ListValue::const_iterator it = whitelist.begin();
+       it != whitelist.end(); ++it) {
+    std::string url_pattern;
+    (*it)->GetAsString(&url_pattern);
+
+    if (!IsInManualWhitelist(url_pattern)) {
+      pref_whitelist->Append((*it)->DeepCopy());
+      AddURLPatternToManualWhitelist(url_pattern);
+    } else if (position == whitelist.GetSize() - 1) {
+      added_last_url = false;
+    }
+    ++position;
+  }
+  return added_last_url;
 }
 
 // static
-void ManagedMode::SetWhitelist(base::ListValue* whitelist) {
-    GetInstance()->managed_profile_->GetPrefs()->Set(
-        prefs::kManagedModeWhitelist, *whitelist);
+bool ManagedMode::IsInManualWhitelist(const std::string& url_pattern) {
+  return GetInstance()->IsInManualWhitelistImpl(url_pattern);
+}
+
+bool ManagedMode::IsInManualWhitelistImpl(const std::string& url_pattern) {
+  StringValue pattern(url_pattern);
+  const ListValue* list = managed_profile_->GetPrefs()->GetList(
+      prefs::kManagedModeWhitelist);
+  return list->Find(pattern) != list->end();
 }
 
 // static
@@ -519,12 +545,25 @@ void ManagedMode::UpdateWhitelist() {
   ui_url_filter_context_->LoadManualLists(GetWhitelist(), GetBlacklist());
 }
 
-void ManagedMode::AddStringToManualWhitelist(const std::string& url) {
-  GetInstance()->io_url_filter_context_->AddStringToManualWhitelist(url);
-  GetInstance()->ui_url_filter_context_->AddStringToManualWhitelist(url);
+scoped_ptr<base::ListValue> ManagedMode::GetWhitelist() {
+  return make_scoped_ptr(
+      managed_profile_->GetPrefs()->GetList(
+          prefs::kManagedModeWhitelist)->DeepCopy());
+}
+
+
+void ManagedMode::AddURLPatternToManualWhitelist(
+    const std::string& url_pattern) {
+  GetInstance()->io_url_filter_context_->AddURLPatternToManualWhitelist(
+      url_pattern);
+  GetInstance()->ui_url_filter_context_->AddURLPatternToManualWhitelist(
+      url_pattern);
 }
 
-void ManagedMode::AddStringToManualBlacklist(const std::string& url) {
-  GetInstance()->io_url_filter_context_->AddStringToManualBlacklist(url);
-  GetInstance()->ui_url_filter_context_->AddStringToManualBlacklist(url);
+void ManagedMode::AddURLPatternToManualBlacklist(
+    const std::string& url_pattern) {
+  GetInstance()->io_url_filter_context_->AddURLPatternToManualBlacklist(
+      url_pattern);
+  GetInstance()->ui_url_filter_context_->AddURLPatternToManualBlacklist(
+      url_pattern);
 }