From 55bcab8cc96da2b0f8bd51d4317c5d13c4016933 Mon Sep 17 00:00:00 2001
From: "yzshen@chromium.org"
 <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 11 Jun 2012 20:36:21 +0000
Subject: Pepper Flash settings integration - camera and microphone.

BUG=112190
TEST=None

Review URL: https://chromiumcodereview.appspot.com/10479015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141482 0039d316-1c4b-4281-b951-d872f2087c98
---
 ppapi/ppapi_shared.gypi                            |  1 +
 ppapi/proxy/ppapi_messages.h                       | 36 ++++++++++++++++++++++
 .../ppp_flash_browser_operations_shared.h          | 33 ++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 ppapi/shared_impl/ppp_flash_browser_operations_shared.h

(limited to 'ppapi')

diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi
index 5afcefe..e993398 100644
--- a/ppapi/ppapi_shared.gypi
+++ b/ppapi/ppapi_shared.gypi
@@ -112,6 +112,7 @@
         'shared_impl/ppb_video_capture_shared.h',
         'shared_impl/ppb_view_shared.cc',
         'shared_impl/ppb_view_shared.h',
+        'shared_impl/ppp_flash_browser_operations_shared.h',
         'shared_impl/ppp_instance_combined.cc',
         'shared_impl/ppp_instance_combined.h',
         'shared_impl/proxy_lock.cc',
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 16c57c1..2889ea4 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -45,6 +45,7 @@
 #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"
 
@@ -118,6 +119,11 @@ 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)
@@ -270,6 +276,36 @@ 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 */,
diff --git a/ppapi/shared_impl/ppp_flash_browser_operations_shared.h b/ppapi/shared_impl/ppp_flash_browser_operations_shared.h
new file mode 100644
index 0000000..c77ad2b
--- /dev/null
+++ b/ppapi/shared_impl/ppp_flash_browser_operations_shared.h
@@ -0,0 +1,33 @@
+// 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 PPAPI_SHARED_IMPL_PPP_FLASH_BROWSER_OPERATIONS_SHARED_H_
+#define PPAPI_SHARED_IMPL_PPP_FLASH_BROWSER_OPERATIONS_SHARED_H_
+
+#include <string>
+#include <vector>
+
+#include "ppapi/c/private/ppp_flash_browser_operations.h"
+
+namespace ppapi {
+
+struct FlashSiteSetting {
+  FlashSiteSetting()
+      : permission(PP_FLASH_BROWSEROPERATIONS_PERMISSION_DEFAULT) {
+  }
+  FlashSiteSetting(const std::string& in_site,
+                   PP_Flash_BrowserOperations_Permission in_permission)
+      : site(in_site),
+        permission(in_permission) {
+  }
+
+  std::string site;
+  PP_Flash_BrowserOperations_Permission permission;
+};
+
+typedef std::vector<FlashSiteSetting> FlashSiteSettings;
+
+}  // namespace ppapi
+
+#endif  // PPAPI_SHARED_IMPL_PPP_FLASH_BROWSER_OPERATIONS_SHARED_H_
-- 
cgit v1.1