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

chrome/browser/ui/webui/options/website_settings_handler.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/website_settings_handler.h"
 
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 73 matching lines @@
        IDS_WEBSITE_SETTINGS_NOTIFICATIONS_DESCRIPTION},
       {"websitesDownloadsDescription",
        IDS_WEBSITE_SETTINGS_DOWNLOAD_DESCRIPTION},
       {"websitesPluginsDescription", IDS_WEBSITE_SETTINGS_PLUGINS_DESCRIPTION},
       {"websitesPopupsDescription", IDS_WEBSITE_SETTINGS_POPUPS_DESCRIPTION},
       {"websitesJavascriptDescription",
        IDS_WEBSITE_SETTINGS_JAVASCRIPT_DESCRIPTION},
       {"websitesImagesDescription", IDS_WEBSITE_SETTINGS_IMAGES_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));
   RegisterTitle(
       localized_strings, "websiteSettingsPage", IDS_WEBSITE_SETTINGS_TITLE);
 }
 
 void WebsiteSettingsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   HostContentSettingsMap* settings = profile->GetHostContentSettingsMap();
@@ skipping 148 matching lines @@
 
   ContentSettingsForOneType all_settings;
   ContentSettingsType last_setting;
   content_settings::GetTypeFromName(last_setting_, &last_setting);
 
   if (last_setting == CONTENT_SETTINGS_TYPE_MEDIASTREAM)
     last_setting = CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
 
   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) {
     // Don't add default settings.
     if (it->primary_pattern == ContentSettingsPattern::Wildcard() &&
         it->secondary_pattern == ContentSettingsPattern::Wildcard() &&
         it->source != kPreferencesSource) {
       continue;
     }
 
@@ skipping 33 matching lines @@
     base::string16 usage_string;
     if (last_usage.ToDoubleT()) {
       usage_string = ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_ELAPSED,
                                             ui::TimeFormat::LENGTH_SHORT,
                                             base::Time::Now() - last_usage);
     }
     origin_entry->SetStringWithoutPathExpansion("usageString", usage_string);
     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) {
   std::string url;
   bool rv = args->GetString(0, &url);
   DCHECK(rv);
   GURL origin(url);
 
   if (!origin.is_valid())
     return;
@@ skipping 290 matching lines @@
     // If extension is NULL, it was removed and we cannot look up its name.
     if (!extension)
       return site_url.spec();
 
     return extension->name();
   }
   return site_url.spec();
 }
 
 }  // namespace options