Content settings lists moved to sub-sub pages.

chrome/browser/dom_ui/options/content_settings_handler.cc

 // Copyright (c) 2010 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/dom_ui/options/content_settings_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 182 matching lines @@
   localized_strings->SetString("removeExceptionRow",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_REMOVE_BUTTON));
   localized_strings->SetString("editExceptionRow",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_EDIT_BUTTON));
   localized_strings->SetString("otr_exceptions_explanation",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_OTR_LABEL));
   localized_strings->SetString("examplePattern",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_PATTERN_EXAMPLE));
   localized_strings->SetString("addNewExceptionInstructions",
       l10n_util::GetStringUTF16(IDS_EXCEPTIONS_ADD_NEW_INSTRUCTIONS));
+  localized_strings->SetString("manage_exceptions",
+      l10n_util::GetStringUTF16(IDS_EXCEPTIONS_MANAGE));
 
   // Cookies filter.
   localized_strings->SetString("cookies_tab_label",
       l10n_util::GetStringUTF16(IDS_COOKIES_TAB_LABEL));
+  localized_strings->SetString("cookies_header",
+      l10n_util::GetStringUTF16(IDS_COOKIES_HEADER));
   localized_strings->SetString("cookies_allow",
       l10n_util::GetStringUTF16(IDS_COOKIES_ALLOW_RADIO));
   localized_strings->SetString("cookies_ask",
       l10n_util::GetStringUTF16(IDS_COOKIES_ASK_EVERY_TIME_RADIO));
   localized_strings->SetString("cookies_block",
       l10n_util::GetStringUTF16(IDS_COOKIES_BLOCK_RADIO));
   localized_strings->SetString("cookies_block_3rd_party",
       l10n_util::GetStringUTF16(IDS_COOKIES_BLOCK_3RDPARTY_CHKBOX));
   localized_strings->SetString("cookies_clear_on_exit",
       l10n_util::GetStringUTF16(IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX));
   localized_strings->SetString("cookies_show_cookies",
       l10n_util::GetStringUTF16(IDS_COOKIES_SHOW_COOKIES_BUTTON));
   localized_strings->SetString("flash_storage_settings",
       l10n_util::GetStringUTF16(IDS_FLASH_STORAGE_SETTINGS));
   localized_strings->SetString("flash_storage_url",
       l10n_util::GetStringUTF16(IDS_FLASH_STORAGE_URL));
 
   // Image filter.
   localized_strings->SetString("images_tab_label",
       l10n_util::GetStringUTF16(IDS_IMAGES_TAB_LABEL));
+  localized_strings->SetString("images_header",
+      l10n_util::GetStringUTF16(IDS_IMAGES_HEADER));
   localized_strings->SetString("images_allow",
       l10n_util::GetStringUTF16(IDS_IMAGES_LOAD_RADIO));
   localized_strings->SetString("images_block",
       l10n_util::GetStringUTF16(IDS_IMAGES_NOLOAD_RADIO));
 
   // JavaScript filter.
   localized_strings->SetString("javascript_tab_label",
       l10n_util::GetStringUTF16(IDS_JAVASCRIPT_TAB_LABEL));
+  localized_strings->SetString("javascript_header",
+      l10n_util::GetStringUTF16(IDS_JAVASCRIPT_HEADER));
   localized_strings->SetString("javascript_allow",
       l10n_util::GetStringUTF16(IDS_JS_ALLOW_RADIO));
   localized_strings->SetString("javascript_block",
       l10n_util::GetStringUTF16(IDS_JS_DONOTALLOW_RADIO));
 
   // Plug-ins filter.
   localized_strings->SetString("plugins_tab_label",
       l10n_util::GetStringUTF16(IDS_PLUGIN_TAB_LABEL));
+  localized_strings->SetString("plugins_header",
+      l10n_util::GetStringUTF16(IDS_PLUGIN_HEADER));
   localized_strings->SetString("plugins_ask",
       l10n_util::GetStringUTF16(IDS_PLUGIN_ASK_RADIO));
   localized_strings->SetString("plugins_allow",
       l10n_util::GetStringUTF16(IDS_PLUGIN_LOAD_RADIO));
   localized_strings->SetString("plugins_block",
       l10n_util::GetStringUTF16(IDS_PLUGIN_NOLOAD_RADIO));
   localized_strings->SetString("disable_individual_plugins",
       l10n_util::GetStringUTF16(IDS_PLUGIN_SELECTIVE_DISABLE));
   localized_strings->SetBoolean("enable_click_to_play",
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClickToPlay));
 
-
   // Pop-ups filter.
   localized_strings->SetString("popups_tab_label",
       l10n_util::GetStringUTF16(IDS_POPUP_TAB_LABEL));
+  localized_strings->SetString("popups_header",
+      l10n_util::GetStringUTF16(IDS_POPUP_HEADER));
   localized_strings->SetString("popups_allow",
       l10n_util::GetStringUTF16(IDS_POPUP_ALLOW_RADIO));
   localized_strings->SetString("popups_block",
       l10n_util::GetStringUTF16(IDS_POPUP_BLOCK_RADIO));
 
   // Location filter.
   localized_strings->SetString("location_tab_label",
       l10n_util::GetStringUTF16(IDS_GEOLOCATION_TAB_LABEL));
+  localized_strings->SetString("location_header",
+      l10n_util::GetStringUTF16(IDS_GEOLOCATION_HEADER));
   localized_strings->SetString("location_allow",
       l10n_util::GetStringUTF16(IDS_GEOLOCATION_ALLOW_RADIO));
   localized_strings->SetString("location_ask",
       l10n_util::GetStringUTF16(IDS_GEOLOCATION_ASK_RADIO));
   localized_strings->SetString("location_block",
       l10n_util::GetStringUTF16(IDS_GEOLOCATION_BLOCK_RADIO));
 
   // Notifications filter.
   localized_strings->SetString("notifications_tab_label",
       l10n_util::GetStringUTF16(IDS_NOTIFICATIONS_TAB_LABEL));
+  localized_strings->SetString("notifications_header",
+      l10n_util::GetStringUTF16(IDS_NOTIFICATIONS_HEADER));
   localized_strings->SetString("notifications_allow",
       l10n_util::GetStringUTF16(IDS_NOTIFICATIONS_ALLOW_RADIO));
   localized_strings->SetString("notifications_ask",
       l10n_util::GetStringUTF16(IDS_NOTIFICATIONS_ASK_RADIO));
   localized_strings->SetString("notifications_block",
       l10n_util::GetStringUTF16(IDS_NOTIFICATIONS_BLOCK_RADIO));
 }
 
 void ContentSettingsHandler::Initialize() {
   const HostContentSettingsMap* settings_map = GetContentSettingsMap();
@@ skipping 25 matching lines @@
   pref_change_registrar_.Add(prefs::kGeolocationDefaultContentSetting, this);
   pref_change_registrar_.Add(prefs::kGeolocationContentSettings, this);
 }
 
 void ContentSettingsHandler::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::PROFILE_DESTROYED: {
       Profile* profile = static_cast<Source<Profile> >(source).ptr();
-      if (profile->IsOffTheRecord())
-        dom_ui_->CallJavascriptFunction(L"ContentSettings.OTRProfileDestroyed");
+      if (profile->IsOffTheRecord()) {
+        dom_ui_->CallJavascriptFunction(
+            L"ContentSettingsExceptionsArea.OTRProfileDestroyed");
+      }
       break;
     }
 
     case NotificationType::OTR_PROFILE_CREATED: {
       UpdateAllOTRExceptionsViewsFromModel();
       break;
     }
 
     case NotificationType::CONTENT_SETTINGS_CHANGED: {
       const ContentSettingsDetails* settings_details =
@@ skipping 214 matching lines @@
       L"ContentSettings.setOTRExceptions", type_string, otr_exceptions);
 }
 
 void ContentSettingsHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("setContentFilter",
       NewCallback(this,
                   &ContentSettingsHandler::SetContentFilter));
   dom_ui_->RegisterMessageCallback("setAllowThirdPartyCookies",
       NewCallback(this,
                   &ContentSettingsHandler::SetAllowThirdPartyCookies));
-  dom_ui_->RegisterMessageCallback("removeExceptions",
+  dom_ui_->RegisterMessageCallback("removeException",
       NewCallback(this,
-                  &ContentSettingsHandler::RemoveExceptions));
+                  &ContentSettingsHandler::RemoveException));
   dom_ui_->RegisterMessageCallback("setException",
       NewCallback(this,
                   &ContentSettingsHandler::SetException));
   dom_ui_->RegisterMessageCallback("checkExceptionPatternValidity",
       NewCallback(this,
                   &ContentSettingsHandler::CheckExceptionPatternValidity));
   dom_ui_->RegisterMessageCallback(
       "openPluginsTab",
       NewCallback(this, &ContentSettingsHandler::OpenPluginsTab));
 }
@@ skipping 20 matching lines @@
         SetDefaultContentSetting(content_type, default_setting);
   }
 }
 
 void ContentSettingsHandler::SetAllowThirdPartyCookies(const ListValue* args) {
   std::wstring allow = ExtractStringValue(args);
 
   GetContentSettingsMap()->SetBlockThirdPartyCookies(allow == L"true");
 }
 
-void ContentSettingsHandler::RemoveExceptions(const ListValue* args) {
+void ContentSettingsHandler::RemoveException(const ListValue* args) {
   size_t arg_i = 0;
   std::string type_string;
   CHECK(args->GetString(arg_i++, &type_string));
 
   ContentSettingsType type = ContentSettingsTypeFromGroupName(type_string);
-  while (arg_i < args->GetSize()) {
-    if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
-      std::string origin;
-      std::string embedding_origin;
-      bool rv = args->GetString(arg_i++, &origin);
-      DCHECK(rv);
-      rv = args->GetString(arg_i++, &embedding_origin);
-      DCHECK(rv);
+  if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
+    std::string origin;
+    std::string embedding_origin;
+    bool rv = args->GetString(arg_i++, &origin);
+    DCHECK(rv);
+    rv = args->GetString(arg_i++, &embedding_origin);
+    DCHECK(rv);
 
-      dom_ui_->GetProfile()->GetGeolocationContentSettingsMap()->
-          SetContentSetting(GURL(origin),
-                            GURL(embedding_origin),
-                            CONTENT_SETTING_DEFAULT);
-    } else if (type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
-      std::string origin;
-      std::string setting;
-      bool rv = args->GetString(arg_i++, &origin);
-      DCHECK(rv);
-      rv = args->GetString(arg_i++, &setting);
-      DCHECK(rv);
-      ContentSetting content_setting = ContentSettingFromString(setting);
-      if (content_setting == CONTENT_SETTING_ALLOW) {
-        dom_ui_->GetProfile()->GetDesktopNotificationService()->
-            ResetAllowedOrigin(GURL(origin));
-      } else {
-        DCHECK_EQ(content_setting, CONTENT_SETTING_BLOCK);
-        dom_ui_->GetProfile()->GetDesktopNotificationService()->
-            ResetBlockedOrigin(GURL(origin));
-      }
+    dom_ui_->GetProfile()->GetGeolocationContentSettingsMap()->
+        SetContentSetting(GURL(origin),
+                          GURL(embedding_origin),
+                          CONTENT_SETTING_DEFAULT);
+  } else if (type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
+    std::string origin;
+    std::string setting;
+    bool rv = args->GetString(arg_i++, &origin);
+    DCHECK(rv);
+    rv = args->GetString(arg_i++, &setting);
+    DCHECK(rv);
+    ContentSetting content_setting = ContentSettingFromString(setting);
+    if (content_setting == CONTENT_SETTING_ALLOW) {
+      dom_ui_->GetProfile()->GetDesktopNotificationService()->
+          ResetAllowedOrigin(GURL(origin));
     } else {
-      std::string mode;
-      bool rv = args->GetString(arg_i++, &mode);
-      DCHECK(rv);
+      DCHECK_EQ(content_setting, CONTENT_SETTING_BLOCK);
+      dom_ui_->GetProfile()->GetDesktopNotificationService()->
+          ResetBlockedOrigin(GURL(origin));
+    }
+  } else {
+    std::string mode;
+    bool rv = args->GetString(arg_i++, &mode);
+    DCHECK(rv);
 
-      std::string pattern;
-      rv = args->GetString(arg_i++, &pattern);
-      DCHECK(rv);
+    std::string pattern;
+    rv = args->GetString(arg_i++, &pattern);
+    DCHECK(rv);
 
-      HostContentSettingsMap* settings_map =
-          mode == "normal" ? GetContentSettingsMap() :
-                             GetOTRContentSettingsMap();
-      // The settings map could be null if the mode was OTR but the OTR profile
-      // got destroyed before we received this message.
-      if (settings_map) {
-        settings_map->SetContentSetting(
-            ContentSettingsPattern(pattern),
-            ContentSettingsTypeFromGroupName(type_string),
-            "",
-            CONTENT_SETTING_DEFAULT);
-      }
+    HostContentSettingsMap* settings_map =
+        mode == "normal" ? GetContentSettingsMap() :
+                           GetOTRContentSettingsMap();
+    // The settings map could be null if the mode was OTR but the OTR profile
+    // got destroyed before we received this message.
+    if (settings_map) {
+      settings_map->SetContentSetting(
+          ContentSettingsPattern(pattern),
+          ContentSettingsTypeFromGroupName(type_string),
+          "",
+          CONTENT_SETTING_DEFAULT);
     }
   }
 }
 
 void ContentSettingsHandler::SetException(const ListValue* args) {
   size_t arg_i = 0;
   std::string type_string;
   CHECK(args->GetString(arg_i++, &type_string));
   std::string mode;
   CHECK(args->GetString(arg_i++, &mode));
@@ skipping 80 matching lines @@
   return dom_ui_->GetProfile()->GetHostContentSettingsMap();
 }
 
 HostContentSettingsMap*
     ContentSettingsHandler::GetOTRContentSettingsMap() {
   Profile* profile = dom_ui_->GetProfile();
   if (profile->HasOffTheRecordProfile())
     return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   return NULL;
 }