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

Side by Side Diff: ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc

Issue 8295023: Move PPB/PPP_MouseLock out of dev/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and resolve conflicts. Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "native_client/src/shared/platform/nacl_check.h" 5 #include "native_client/src/shared/platform/nacl_check.h"
6 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h" 6 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
7 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_core.h" 7 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_core.h"
8 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_var.h" 8 #include "native_client/src/shared/ppapi_proxy/plugin_ppb_var.h"
9 #include "native_client/src/shared/ppapi_proxy/ppruntime.h" 9 #include "native_client/src/shared/ppapi_proxy/ppruntime.h"
10 #include "native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h" 10 #include "native_client/src/shared/ppapi_proxy/untrusted/srpcgen/ppp_rpc.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 const PPP_Instance* PPPInstanceInterface() { 112 const PPP_Instance* PPPInstanceInterface() {
113 static const void* ppp = GetPluginInterfaceSafe(PPP_INSTANCE_INTERFACE); 113 static const void* ppp = GetPluginInterfaceSafe(PPP_INSTANCE_INTERFACE);
114 return static_cast<const PPP_Instance*>(ppp); 114 return static_cast<const PPP_Instance*>(ppp);
115 } 115 }
116 116
117 const PPP_Messaging* PPPMessagingInterface() { 117 const PPP_Messaging* PPPMessagingInterface() {
118 static const void* ppp = GetPluginInterfaceSafe(PPP_MESSAGING_INTERFACE); 118 static const void* ppp = GetPluginInterfaceSafe(PPP_MESSAGING_INTERFACE);
119 return static_cast<const PPP_Messaging*>(ppp); 119 return static_cast<const PPP_Messaging*>(ppp);
120 } 120 }
121 121
122 const PPP_MouseLock_Dev* PPPMouseLockInterface() { 122 const PPP_MouseLock* PPPMouseLockInterface() {
123 static const void* ppp = GetPluginInterfaceSafe(PPP_MOUSELOCK_DEV_INTERFACE); 123 static const void* ppp = GetPluginInterfaceSafe(PPP_MOUSELOCK_INTERFACE);
124 return static_cast<const PPP_MouseLock_Dev*>(ppp); 124 return static_cast<const PPP_MouseLock*>(ppp);
125 } 125 }
126 126
127 const PPP_Printing_Dev* PPPPrintingInterface() { 127 const PPP_Printing_Dev* PPPPrintingInterface() {
128 static const void* ppp = GetPluginInterfaceSafe(PPP_PRINTING_DEV_INTERFACE); 128 static const void* ppp = GetPluginInterfaceSafe(PPP_PRINTING_DEV_INTERFACE);
129 return static_cast<const PPP_Printing_Dev*>(ppp); 129 return static_cast<const PPP_Printing_Dev*>(ppp);
130 } 130 }
131 131
132 const PPP_Scrollbar_Dev* PPPScrollbarInterface() { 132 const PPP_Scrollbar_Dev* PPPScrollbarInterface() {
133 static const void* ppp = GetPluginInterfaceSafe(PPP_SCROLLBAR_DEV_INTERFACE); 133 static const void* ppp = GetPluginInterfaceSafe(PPP_SCROLLBAR_DEV_INTERFACE);
134 return static_cast<const PPP_Scrollbar_Dev*>(ppp); 134 return static_cast<const PPP_Scrollbar_Dev*>(ppp);
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 PpapiPluginRegisterDefaultThreadCreator(); 177 PpapiPluginRegisterDefaultThreadCreator();
178 // Designate this as the main thread for PPB_Core::IsMainThread(). 178 // Designate this as the main thread for PPB_Core::IsMainThread().
179 ppapi_proxy::PluginCore::MarkMainThread(); 179 ppapi_proxy::PluginCore::MarkMainThread();
180 if (!NaClSrpcAcceptClientConnection(PppRpcs::srpc_methods)) { 180 if (!NaClSrpcAcceptClientConnection(PppRpcs::srpc_methods)) {
181 return 1; 181 return 1;
182 } 182 }
183 NaClSrpcModuleFini(); 183 NaClSrpcModuleFini();
184 184
185 return 0; 185 return 0;
186 } 186 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h ('k') | ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698