| Index: ppapi/proxy/ppapi_messages.h | 
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h | 
| index 3eba62ee9f52b3a5ecfdd61138a2cb10400e7fa7..3d44a63d008efa7b9e47ec92755bd6fd36dc0864 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) | 
| @@ -268,6 +274,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 */, | 
|  |