Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: ppapi/proxy/talk_resource.cc

Issue 16271005: Implement pepper interface and plumbing for HRD's UI on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't use IPC::Message::Schema::Read in unittest - build break Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/talk_resource.h ('k') | ppapi/proxy/talk_resource_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/talk_resource.cc
diff --git a/ppapi/proxy/talk_resource.cc b/ppapi/proxy/talk_resource.cc
index 557e30640400bf81bb4bdd2b6845376120c4677d..01ee0ac3300d1016a8406f3dd8dee23748ef1df9 100644
--- a/ppapi/proxy/talk_resource.cc
+++ b/ppapi/proxy/talk_resource.cc
@@ -10,7 +10,10 @@ namespace ppapi {
namespace proxy {
TalkResource::TalkResource(Connection connection, PP_Instance instance)
- : PluginResource(connection, instance) {
+ : PluginResource(connection, instance),
+ event_callback_(NULL),
+ event_callback_user_data_(NULL) {
+ SendCreate(BROWSER, PpapiHostMsg_Talk_Create());
}
TalkResource::~TalkResource() {
@@ -20,24 +23,90 @@ thunk::PPB_Talk_Private_API* TalkResource::AsPPB_Talk_Private_API() {
return this;
}
-int32_t TalkResource::GetPermission(scoped_refptr<TrackedCallback> callback) {
- if (TrackedCallback::IsPending(callback_))
+int32_t TalkResource::RequestPermission(
+ PP_TalkPermission permission,
+ scoped_refptr<TrackedCallback> callback) {
+ if (TrackedCallback::IsPending(permission_callback_))
return PP_ERROR_INPROGRESS;
- callback_ = callback;
- if (!sent_create_to_browser())
- SendCreate(BROWSER, PpapiHostMsg_Talk_Create());
+ permission_callback_ = callback;
- Call<PpapiPluginMsg_Talk_GetPermissionReply>(
+ Call<PpapiPluginMsg_Talk_RequestPermissionReply>(
BROWSER,
- PpapiHostMsg_Talk_GetPermission(),
- base::Bind(&TalkResource::GetPermissionReply, base::Unretained(this)));
+ PpapiHostMsg_Talk_RequestPermission(permission),
+ base::Bind(&TalkResource::OnRequestPermissionReply,
+ base::Unretained(this)));
return PP_OK_COMPLETIONPENDING;
}
-void TalkResource::GetPermissionReply(
+int32_t TalkResource::StartRemoting(PP_TalkEventCallback event_callback,
+ void* user_data,
+ scoped_refptr<TrackedCallback> callback) {
+ if (TrackedCallback::IsPending(start_callback_) ||
+ event_callback_ != NULL)
+ return PP_ERROR_INPROGRESS;
+
+ start_callback_ = callback;
+ event_callback_ = event_callback;
+ event_callback_user_data_ = user_data;
+
+ Call<PpapiPluginMsg_Talk_StartRemotingReply>(
+ BROWSER,
+ PpapiHostMsg_Talk_StartRemoting(),
+ base::Bind(&TalkResource::OnStartRemotingReply,
+ base::Unretained(this)));
+ return PP_OK_COMPLETIONPENDING;
+}
+
+int32_t TalkResource::StopRemoting(scoped_refptr<TrackedCallback> callback) {
+ if (TrackedCallback::IsPending(stop_callback_))
+ return PP_ERROR_INPROGRESS;
+
+ if (event_callback_ == NULL)
+ return PP_ERROR_FAILED;
+
+ stop_callback_ = callback;
+
+ Call<PpapiPluginMsg_Talk_StopRemotingReply>(
+ BROWSER,
+ PpapiHostMsg_Talk_StopRemoting(),
+ base::Bind(&TalkResource::OnStopRemotingReply,
+ base::Unretained(this)));
+ return PP_OK_COMPLETIONPENDING;
+}
+
+void TalkResource::OnReplyReceived(const ResourceMessageReplyParams& params,
+ const IPC::Message& msg) {
+ IPC_BEGIN_MESSAGE_MAP(TalkResource, msg)
+ PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL(
+ PpapiPluginMsg_Talk_NotifyEvent,
+ OnNotifyEvent)
+ PPAPI_DISPATCH_PLUGIN_RESOURCE_CALL_UNHANDLED(
+ PluginResource::OnReplyReceived(params, msg))
+ IPC_END_MESSAGE_MAP()
+}
+
+void TalkResource::OnNotifyEvent(const ResourceMessageReplyParams& params,
+ PP_TalkEvent event) {
+ if (event_callback_ != NULL)
+ event_callback_(event_callback_user_data_, event);
+}
+
+void TalkResource::OnRequestPermissionReply(
+ const ResourceMessageReplyParams& params) {
+ permission_callback_->Run(params.result());
+}
+
+void TalkResource::OnStartRemotingReply(
+ const ResourceMessageReplyParams& params) {
+ start_callback_->Run(params.result());
+}
+
+void TalkResource::OnStopRemotingReply(
const ResourceMessageReplyParams& params) {
- callback_->Run(params.result());
+ event_callback_ = NULL;
+ event_callback_user_data_ = NULL;
+ stop_callback_->Run(params.result());
}
} // namespace proxy
« no previous file with comments | « ppapi/proxy/talk_resource.h ('k') | ppapi/proxy/talk_resource_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698