Revert 141482 - Pepper Flash settings integration - camera and microphone.

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

Index: chrome/browser/ui/webui/options2/content_settings_handler2.h
===================================================================
--- chrome/browser/ui/webui/options2/content_settings_handler2.h	(revision 141490)
+++ chrome/browser/ui/webui/options2/content_settings_handler2.h	(working copy)
@@ -6,11 +6,7 @@
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_
 #pragma once
 
-#include <map>
-#include <string>
-
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/pepper_flash_settings_manager.h"
+#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"
@@ -23,8 +19,7 @@
 
 namespace options2 {
 
-class ContentSettingsHandler : public OptionsPageUIHandler,
-                               public PepperFlashSettingsManager::Client {
+class ContentSettingsHandler : public OptionsPageUIHandler {
  public:
   ContentSettingsHandler();
   virtual ~ContentSettingsHandler();
@@ -40,46 +35,20 @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // PepperFlashSettingsManager::Client implementation.
-  virtual void OnGetPermissionSettingsCompleted(
-      uint32 request_id,
-      bool success,
-      PP_Flash_BrowserOperations_Permission default_permission,
-      const ppapi::FlashSiteSettings& sites) OVERRIDE;
-
   // Gets a string identifier for the group name, for use in HTML.
   static std::string ContentSettingsTypeToGroupName(ContentSettingsType type);
 
  private:
-  // Extends ContentSettingsType with some other types that will be also
-  // displayed in the content settings UI.
-  class ExContentSettingsType;
-  struct ExContentSettingsTypeNameEntry;
-
-  struct CachedPepperFlashSettings {
-    CachedPepperFlashSettings();
-    ~CachedPepperFlashSettings();
-
-    PP_Flash_BrowserOperations_Permission default_permission;
-
-    typedef std::map<std::string, PP_Flash_BrowserOperations_Permission>
-        SiteMap;
-    SiteMap sites;
-
-    bool initialized;
-  };
-
   // Functions that call into the page -----------------------------------------
 
   // Updates the page with the default settings (allow, ask, block, etc.)
-  void UpdateSettingDefaultFromModel(const ExContentSettingsType& type);
+  void UpdateSettingDefaultFromModel(ContentSettingsType type);
 
   // Clobbers and rebuilds the specific content setting type exceptions table.
-  void UpdateExceptionsViewFromModel(const ExContentSettingsType& type);
+  void UpdateExceptionsViewFromModel(ContentSettingsType type);
   // Clobbers and rebuilds the specific content setting type exceptions
   // OTR table.
-  void UpdateOTRExceptionsViewFromModel(
-      const ExContentSettingsType& type);
+  void UpdateOTRExceptionsViewFromModel(ContentSettingsType type);
   // Clobbers and rebuilds all the exceptions tables in the page (both normal
   // and OTR tables).
   void UpdateAllExceptionsViewsFromModel();
@@ -89,9 +58,6 @@
   void UpdateGeolocationExceptionsView();
   // Clobbers and rebuilds just the desktop notification exception table.
   void UpdateNotificationExceptionsView();
-  // Clobbers and rebuilds just the Pepper Flash camera and microphone exception
-  // table.
-  void UpdateFlashCameraMicExceptionsView();
   // Clobbers and rebuilds an exception table that's managed by the host content
   // settings map.
   void UpdateExceptionsViewFromHostContentSettingsMap(ContentSettingsType type);
@@ -136,27 +102,17 @@
 
   // 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(const ExContentSettingsType& type,
+  std::string GetSettingDefaultFromModel(ContentSettingsType type,
                                          std::string* provider_id);
 
   // Gets the ProtocolHandlerRegistry for the normal profile.
   ProtocolHandlerRegistry* GetProtocolHandlerRegistry();
 
-  static ExContentSettingsType ExContentSettingsTypeFromGroupName(
-      const std::string& name);
-  static std::string ExContentSettingsTypeToGroupName(
-      const ExContentSettingsType& type);
-
   // Member variables ---------------------------------------------------------
 
   content::NotificationRegistrar notification_registrar_;
   PrefChangeRegistrar pref_change_registrar_;
-  scoped_ptr<PepperFlashSettingsManager> flash_settings_manager_;
-  CachedPepperFlashSettings flash_cameramic_settings_;
 
-  static const ExContentSettingsTypeNameEntry
-      kExContentSettingsTypeGroupNames[];
-
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
Property changes on: chrome\browser\ui\webui\options2\content_settings_handler2.h
___________________________________________________________________
Deleted: svn:mergeinfo