| Index: chrome/browser/renderer_host/pepper/pepper_talk_host.h
|
| diff --git a/chrome/browser/renderer_host/pepper/pepper_talk_host.h b/chrome/browser/renderer_host/pepper/pepper_talk_host.h
|
| index 3b754fd05b8ae049af0e9236975b717edc2952a6..c5ca13b71033d1993a394d907a975c4da780e352 100644
|
| --- a/chrome/browser/renderer_host/pepper/pepper_talk_host.h
|
| +++ b/chrome/browser/renderer_host/pepper/pepper_talk_host.h
|
| @@ -29,25 +29,25 @@ class PepperTalkHost : public ppapi::host::ResourceHost {
|
| PP_Resource resource);
|
| virtual ~PepperTalkHost();
|
|
|
| + private:
|
| // ResourceHost override.
|
| virtual int32_t OnResourceMessageReceived(
|
| const IPC::Message& msg,
|
| ppapi::host::HostMessageContext* context) OVERRIDE;
|
|
|
| - // Sends the reply.
|
| - void GotTalkPermission(ppapi::host::ReplyMessageContext reply);
|
| + int32_t OnRequestPermission(ppapi::host::HostMessageContext* context,
|
| + PP_TalkPermission permission);
|
| + int32_t OnStartRemoting(ppapi::host::HostMessageContext* context);
|
| + int32_t OnStopRemoting(ppapi::host::HostMessageContext* context);
|
| + void OnRemotingStopEvent();
|
|
|
| - private:
|
| - int32_t OnRequestPermission(
|
| - ppapi::host::HostMessageContext* context,
|
| - PP_TalkPermission permission);
|
| - int32_t OnStartRemoting(
|
| - ppapi::host::HostMessageContext* context);
|
| - int32_t OnStopRemoting(
|
| - ppapi::host::HostMessageContext* context);
|
| + void OnRequestPermissionCompleted(ppapi::host::ReplyMessageContext reply);
|
| + void OnStartRemotingCompleted(ppapi::host::ReplyMessageContext reply);
|
| + void OnStopRemotingCompleted(ppapi::host::ReplyMessageContext reply);
|
|
|
| base::WeakPtrFactory<PepperTalkHost> weak_factory_;
|
| content::BrowserPpapiHost* browser_ppapi_host_;
|
| + bool remoting_started_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PepperTalkHost);
|
| };
|
|
|