Split the Website Settings page's origin list into Allowed and Blocked lists.

Split the Website Settings page's origin list into Allowed and Blocked lists when both lists exists.

BUG=372607
Committed: https://crrev.com/5994c3807d40ced875d1d46af3e8114aa26f5a21
Cr-Commit-Position: refs/heads/master@{#293779}

[Daniel Nishi, 2014-09-05 20:23:05]

dhnishi@chromium.org changed reviewers:
+ bauerb@chromium.org

[Daniel Nishi, 2014-09-05 20:23:06]

bauerb: PTAL. I'm beginning the process of converting the UI to fit the changed
mocks.

[Bernhard Bauer, 2014-09-08 07:55:33]

LGTM!

[Daniel Nishi, 2014-09-08 15:14:01]

The CQ bit was checked by dhnishi@chromium.org

[commit-bot: I haz the power, 2014-09-08 15:17:18]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dhnishi@chromium.org/542203003/20001

[commit-bot: I haz the power, 2014-09-08 16:59:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-09-08 16:59:23]

Failed to apply patch for
chrome/browser/ui/webui/options/website_settings_handler.cc:
While running git apply --index -p1;
  error: patch failed:
chrome/browser/ui/webui/options/website_settings_handler.cc:79
  error: chrome/browser/ui/webui/options/website_settings_handler.cc: patch does
not apply

Patch:       chrome/browser/ui/webui/options/website_settings_handler.cc
Index: chrome/browser/ui/webui/options/website_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/website_settings_handler.cc
b/chrome/browser/ui/webui/options/website_settings_handler.cc
index
38405e1ba596d527d95554942447fdf646753bdb..5d4bcb629ea4801cd1b61e11e345ee2dac48b4c6
100644
--- a/chrome/browser/ui/webui/options/website_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/website_settings_handler.cc
@@ -79,6 +79,7 @@ void WebsiteSettingsHandler::GetLocalizedValues(
        IDS_WEBSITE_SETTINGS_NOTIFICATIONS_DESCRIPTION},
       {"websitesButtonClear", IDS_WEBSITE_SETTINGS_STORAGE_CLEAR_BUTTON},
       {"websitesButtonStop", IDS_WEBSITE_SETTINGS_BATTERY_STOP_BUTTON},
+      {"websitesBlockedListTitle", IDS_WEBSITE_SETTINGS_BLOCKED_LIST_TITLE},
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
@@ -247,7 +248,8 @@ void WebsiteSettingsHandler::UpdateOrigins() {
 
   settings->GetSettingsForOneType(last_setting, std::string(), &all_settings);
 
-  base::DictionaryValue origins;
+  base::DictionaryValue allowed_origins;
+  base::DictionaryValue blocked_origins;
   for (ContentSettingsForOneType::const_iterator it = all_settings.begin();
        it != all_settings.end();
        ++it) {
@@ -301,11 +303,15 @@ void WebsiteSettingsHandler::UpdateOrigins() {
     origin_entry->SetStringWithoutPathExpansion("readableName",
                                                 GetReadableName(origin_url));
 
-    origins.SetWithoutPathExpansion(origin, origin_entry);
+    if (it->setting == CONTENT_SETTING_BLOCK)
+      blocked_origins.SetWithoutPathExpansion(origin, origin_entry);
+    else
+      allowed_origins.SetWithoutPathExpansion(origin, origin_entry);
   }
 
   web_ui()->CallJavascriptFunction("WebsiteSettingsManager.populateOrigins",
-                                   origins);
+                                   allowed_origins,
+                                   blocked_origins);
 }
 
 void WebsiteSettingsHandler::HandleGetOriginInfo(const base::ListValue* args) {

[Daniel Nishi, 2014-09-08 17:28:29]

The CQ bit was checked by dhnishi@chromium.org

[commit-bot: I haz the power, 2014-09-08 17:39:34]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/dhnishi@chromium.org/542203003/40001

[commit-bot: I haz the power, 2014-09-08 20:33:47]

Committed patchset #3 (id:40001) as f2b1cffe62e2e11ff39bcc895fc37b6104e25fdc

[commit-bot: I haz the power, 2014-09-10 03:47:58]

Patchset 3 (id:??) landed as
https://crrev.com/5994c3807d40ced875d1d46af3e8114aa26f5a21
Cr-Commit-Position: refs/heads/master@{#293779}