Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play.

chrome/browser/ui/webui/options2/content_settings_handler2.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_
 #pragma once
 
 #include "chrome/browser/plugin_data_remover_helper.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 #include "chrome/common/content_settings_types.h"
+#include "chrome/common/content_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class HostContentSettingsMap;
 class ProtocolHandlerRegistry;
 
 namespace options2 {
 
 class ContentSettingsHandler : public OptionsPageUIHandler {
  public:
@@ skipping 59 matching lines @@
   // Changes the value of an exception. Called after the user is done editing an
   // exception.
   void SetException(const ListValue* args);
 
   // Called to decide whether a given pattern is valid, or if it should be
   // rejected. Called while the user is editing an exception pattern.
   void CheckExceptionPatternValidity(const ListValue* args);
 
   // Utility functions ---------------------------------------------------------
 
+  // Applies content settings whitelists to reduce breakage / user confusion.
+  void ApplyWhitelist(ContentSettingsType content_type,
+                      ContentSetting default_setting);
+
   // Gets the HostContentSettingsMap for the normal profile.
   HostContentSettingsMap* GetContentSettingsMap();
 
   // Gets the HostContentSettingsMap for the incognito profile, or NULL if there
   // is no active incognito session.
   HostContentSettingsMap* GetOTRContentSettingsMap();
 
   // Gets the default setting in string form. If |provider_id| is not NULL, the
   // id of the provider which provided the default setting is assigned to it.
   std::string GetSettingDefaultFromModel(ContentSettingsType type,
                                          std::string* provider_id);
 
   // Gets the ProtocolHandlerRegistry for the normal profile.
   ProtocolHandlerRegistry* GetProtocolHandlerRegistry();
 
   // Member variables ---------------------------------------------------------
 
   content::NotificationRegistrar notification_registrar_;
   PrefChangeRegistrar pref_change_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
 }  // namespace options2
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_