Clear plugin data together with cookies on shutdown.

chrome/browser/dom_ui/options/content_settings_handler.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_helper.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
@@ skipping 186 matching lines @@
   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));
@@ skipping 66 matching lines @@
       l10n_util::GetStringUTF16(IDS_NOTIFICATIONS_BLOCK_RADIO));
 }
 
 void ContentSettingsHandler::Initialize() {
   const HostContentSettingsMap* settings_map = GetContentSettingsMap();
   scoped_ptr<Value> block_3rd_party(Value::CreateBooleanValue(
       settings_map->BlockThirdPartyCookies()));
   dom_ui_->CallJavascriptFunction(
       L"ContentSettings.setBlockThirdPartyCookies", *block_3rd_party.get());
 
+  clear_plugin_lso_data_enabled_.Init(prefs::kClearPluginLSODataEnabled,
+                                      g_browser_process->local_state(),
+                                      this);
+  UpdateClearPluginLSOData();
+
   notification_registrar_.Add(
       this, NotificationType::OTR_PROFILE_CREATED,
       NotificationService::AllSources());
   notification_registrar_.Add(
       this, NotificationType::PROFILE_DESTROYED,
       NotificationService::AllSources());
 
   UpdateAllExceptionsViewsFromModel();
   notification_registrar_.Add(
       this, NotificationType::CONTENT_SETTINGS_CHANGED,
@@ skipping 40 matching lines @@
         UpdateExceptionsViewFromModel(settings_details->type());
       break;
     }
 
     case NotificationType::PREF_CHANGED: {
       const std::string& pref_name = *Details<std::string>(details).ptr();
       if (pref_name == prefs::kGeolocationDefaultContentSetting)
         UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_GEOLOCATION);
       else if (pref_name == prefs::kGeolocationContentSettings)
         UpdateGeolocationExceptionsView();
+      else if (pref_name == prefs::kClearPluginLSODataEnabled)
+        UpdateClearPluginLSOData();
       break;
     }
 
     case NotificationType::DESKTOP_NOTIFICATION_DEFAULT_CHANGED: {
       UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
       break;
     }
 
     case NotificationType::DESKTOP_NOTIFICATION_SETTINGS_CHANGED: {
       UpdateNotificationExceptionsView();
       break;
     }
 
     default:
       OptionsPageUIHandler::Observe(type, source, details);
   }
 }
 
+void ContentSettingsHandler::UpdateClearPluginLSOData() {
+  int label_id = clear_plugin_lso_data_enabled_.GetValue() ?
+      IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX :
+      IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX;
+  scoped_ptr<Value> label(
+      Value::CreateStringValue(l10n_util::GetStringUTF16(label_id)));
+  dom_ui_->CallJavascriptFunction(
+      L"ContentSettings.setClearLocalDataOnShutdownLabel", *label);
+}
+
 void ContentSettingsHandler::UpdateSettingDefaultFromModel(
     ContentSettingsType type) {
   DictionaryValue filter_settings;
   filter_settings.SetString(ContentSettingsTypeToGroupName(type) + ".value",
       GetSettingDefaultFromModel(type));
   filter_settings.SetBoolean(ContentSettingsTypeToGroupName(type) + ".managed",
       GetDefaultSettingManagedFromModel(type));
 
   dom_ui_->CallJavascriptFunction(
       L"ContentSettings.setContentFilterSettingsValue", filter_settings);
@@ skipping 367 matching lines @@
   return dom_ui_->GetProfile()->GetHostContentSettingsMap();
 }
 
 HostContentSettingsMap*
     ContentSettingsHandler::GetOTRContentSettingsMap() {
   Profile* profile = dom_ui_->GetProfile();
   if (profile->HasOffTheRecordProfile())
     return profile->GetOffTheRecordProfile()->GetHostContentSettingsMap();
   return NULL;
 }