summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
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 /ppapi/proxy
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 'ppapi/proxy')
-rw-r--r--ppapi/proxy/ppapi_messages.h36
1 files changed, 0 insertions, 36 deletions
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index a62d87d..7b0c2230 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -45,7 +45,6 @@
#include "ppapi/shared_impl/ppb_network_list_private_shared.h"
#include "ppapi/shared_impl/ppb_url_request_info_shared.h"
#include "ppapi/shared_impl/ppb_view_shared.h"
-#include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
#include "ppapi/shared_impl/private/ppb_host_resolver_shared.h"
#include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
@@ -119,11 +118,6 @@ IPC_STRUCT_TRAITS_BEGIN(ppapi::DeviceRefData)
IPC_STRUCT_TRAITS_MEMBER(id)
IPC_STRUCT_TRAITS_END()
-IPC_STRUCT_TRAITS_BEGIN(ppapi::FlashSiteSetting)
- IPC_STRUCT_TRAITS_MEMBER(site)
- IPC_STRUCT_TRAITS_MEMBER(permission)
-IPC_STRUCT_TRAITS_END()
-
IPC_STRUCT_TRAITS_BEGIN(ppapi::ViewData)
IPC_STRUCT_TRAITS_MEMBER(rect)
IPC_STRUCT_TRAITS_MEMBER(is_fullscreen)
@@ -276,36 +270,6 @@ IPC_MESSAGE_CONTROL2(PpapiHostMsg_DeauthorizeContentLicensesResult,
uint32 /* request_id */,
bool /* success */)
-IPC_MESSAGE_CONTROL3(PpapiMsg_GetPermissionSettings,
- uint32 /* request_id */,
- FilePath /* plugin_data_path */,
- PP_Flash_BrowserOperations_SettingType /* setting_type */)
-IPC_MESSAGE_CONTROL4(
- PpapiHostMsg_GetPermissionSettingsResult,
- uint32 /* request_id */,
- bool /* success */,
- PP_Flash_BrowserOperations_Permission /* default_permission */,
- ppapi::FlashSiteSettings /* sites */)
-
-IPC_MESSAGE_CONTROL5(PpapiMsg_SetDefaultPermission,
- uint32 /* request_id */,
- FilePath /* plugin_data_path */,
- PP_Flash_BrowserOperations_SettingType /* setting_type */,
- PP_Flash_BrowserOperations_Permission /* permission */,
- bool /* clear_site_specific */)
-IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetDefaultPermissionResult,
- uint32 /* request_id */,
- bool /* success */)
-
-IPC_MESSAGE_CONTROL4(PpapiMsg_SetSitePermission,
- uint32 /* request_id */,
- FilePath /* plugin_data_path */,
- PP_Flash_BrowserOperations_SettingType /* setting_type */,
- ppapi::FlashSiteSettings /* sites */)
-IPC_MESSAGE_CONTROL2(PpapiHostMsg_SetSitePermissionResult,
- uint32 /* request_id */,
- bool /* success */)
-
// Broker Process.
IPC_SYNC_MESSAGE_CONTROL2_1(PpapiMsg_ConnectToPlugin,
PP_Instance /* instance */,