summaryrefslogtreecommitdiffstats
path: root/chrome/browser/pepper_flash_settings_manager.h
diff options
context:
space:
mode:
authoryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 21:01:54 +0000
committeryzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-11 21:01:54 +0000
commit5c69d0840291641a73bbe040a6e6cebe0c3114d4 (patch)
treedf80996df716d4188d55071e228a51805dccb085 /chrome/browser/pepper_flash_settings_manager.h
parent0d02104a4c82b4989e830e140cb6129f320c2191 (diff)
downloadchromium_src-5c69d0840291641a73bbe040a6e6cebe0c3114d4.zip
chromium_src-5c69d0840291641a73bbe040a6e6cebe0c3114d4.tar.gz
chromium_src-5c69d0840291641a73bbe040a6e6cebe0c3114d4.tar.bz2
Revert 141482 - Pepper Flash settings integration - camera and microphone.
BUG=112190 TEST=None Review URL: https://chromiumcodereview.appspot.com/10479015 TBR=yzshen@chromium.org Review URL: https://chromiumcodereview.appspot.com/10536103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/pepper_flash_settings_manager.h')
-rw-r--r--chrome/browser/pepper_flash_settings_manager.h35
1 files changed, 1 insertions, 34 deletions
diff --git a/chrome/browser/pepper_flash_settings_manager.h b/chrome/browser/pepper_flash_settings_manager.h
index 1048912..4a20df3 100644
--- a/chrome/browser/pepper_flash_settings_manager.h
+++ b/chrome/browser/pepper_flash_settings_manager.h
@@ -8,8 +8,6 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "ppapi/c/private/ppp_flash_browser_operations.h"
-#include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
class PluginPrefs;
class PrefService;
@@ -31,18 +29,7 @@ class PepperFlashSettingsManager {
virtual ~Client() {}
virtual void OnDeauthorizeContentLicensesCompleted(uint32 request_id,
- bool success) {}
- virtual void OnGetPermissionSettingsCompleted(
- uint32 request_id,
- bool success,
- PP_Flash_BrowserOperations_Permission default_permission,
- const ppapi::FlashSiteSettings& sites) {}
-
- virtual void OnSetDefaultPermissionCompleted(uint32 request_id,
- bool success) {}
-
- virtual void OnSetSitePermissionCompleted(uint32 request_id,
- bool success) {}
+ bool success) = 0;
};
// |client| must outlive this object. It is guaranteed that |client| won't
@@ -65,26 +52,6 @@ class PepperFlashSettingsManager {
// Client::OnDeauthorizeContentLicensesCompleted().
uint32 DeauthorizeContentLicenses();
- // Gets permission settings.
- // Client::OnGetPermissionSettingsCompleted() will be called when the
- // operation is completed.
- uint32 GetPermissionSettings(
- PP_Flash_BrowserOperations_SettingType setting_type);
-
- // Sets default permission.
- // Client::OnSetDefaultPermissionCompleted() will be called when the
- // operation is completed.
- uint32 SetDefaultPermission(
- PP_Flash_BrowserOperations_SettingType setting_type,
- PP_Flash_BrowserOperations_Permission permission,
- bool clear_site_specific);
-
- // Sets site-specific permission.
- // Client::OnSetSitePermissionCompleted() will be called when the operation
- // is completed.
- uint32 SetSitePermission(PP_Flash_BrowserOperations_SettingType setting_type,
- const ppapi::FlashSiteSettings& sites);
-
private:
// Core does most of the work. It is ref-counted so that its lifespan can be
// independent of the containing object's: