diff options
author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-16 02:26:56 +0000 |
---|---|---|
committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-16 02:26:56 +0000 |
commit | 1314f5f673e337ec559c973be90abf5db7ebf17e (patch) | |
tree | 4572a46d5c654645facd1595abeff44b7d6fd394 /ppapi/proxy | |
parent | 7f26918a79ab8fd9ec095ccece9b3ba3002e6207 (diff) | |
download | chromium_src-1314f5f673e337ec559c973be90abf5db7ebf17e.zip chromium_src-1314f5f673e337ec559c973be90abf5db7ebf17e.tar.gz chromium_src-1314f5f673e337ec559c973be90abf5db7ebf17e.tar.bz2 |
Move PPB/PPP_MouseLock out of dev/.
BUG=41781
TEST=None
Review URL: http://codereview.chromium.org/8295023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r-- | ppapi/proxy/interface_id.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/interface_list.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppapi_messages.h | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppb_instance_proxy.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/ppp_mouse_lock_proxy.cc | 14 | ||||
-rw-r--r-- | ppapi/proxy/ppp_mouse_lock_proxy.h | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/ppapi/proxy/interface_id.h b/ppapi/proxy/interface_id.h index 08ef071..4b5c29e 100644 --- a/ppapi/proxy/interface_id.h +++ b/ppapi/proxy/interface_id.h @@ -53,7 +53,7 @@ enum InterfaceID { INTERFACE_ID_PPP_INSTANCE, INTERFACE_ID_PPP_INSTANCE_PRIVATE, INTERFACE_ID_PPP_MESSAGING, - INTERFACE_ID_PPP_MOUSE_LOCK_DEV, + INTERFACE_ID_PPP_MOUSE_LOCK, INTERFACE_ID_PPP_VIDEO_CAPTURE_DEV, INTERFACE_ID_PPP_VIDEO_DECODER_DEV, diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index fc2c266..351790c 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -16,7 +16,6 @@ #include "ppapi/c/dev/ppb_fullscreen_dev.h" #include "ppapi/c/dev/ppb_ime_input_event_dev.h" #include "ppapi/c/dev/ppb_memory_dev.h" -#include "ppapi/c/dev/ppb_mouse_lock_dev.h" #include "ppapi/c/dev/ppb_surface_3d_dev.h" #include "ppapi/c/dev/ppb_testing_dev.h" #include "ppapi/c/dev/ppb_text_input_dev.h" @@ -35,6 +34,7 @@ #include "ppapi/c/ppb_input_event.h" #include "ppapi/c/ppb_instance.h" #include "ppapi/c/ppb_messaging.h" +#include "ppapi/c/ppb_mouse_lock.h" #include "ppapi/c/ppb_opengles2.h" #include "ppapi/c/ppb_url_loader.h" #include "ppapi/c/ppb_url_request_info.h" diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index 3b61d1a..9bf77d6 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -399,7 +399,7 @@ IPC_MESSAGE_ROUTED2(PpapiMsg_PPPMessaging_HandleMessage, PP_Instance /* instance */, ppapi::proxy::SerializedVar /* message */) -// PPP_MouseLock_Dev. +// PPP_MouseLock. IPC_MESSAGE_ROUTED1(PpapiMsg_PPPMouseLock_MouseLockLost, PP_Instance /* instance */) diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 1856c82..1a99b47 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -4,11 +4,11 @@ #include "ppapi/proxy/ppb_instance_proxy.h" -#include "ppapi/c/dev/ppb_mouse_lock_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_instance.h" #include "ppapi/c/ppb_messaging.h" +#include "ppapi/c/ppb_mouse_lock.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_resource_tracker.h" diff --git a/ppapi/proxy/ppp_mouse_lock_proxy.cc b/ppapi/proxy/ppp_mouse_lock_proxy.cc index e39a914..6983c64 100644 --- a/ppapi/proxy/ppp_mouse_lock_proxy.cc +++ b/ppapi/proxy/ppp_mouse_lock_proxy.cc @@ -4,7 +4,7 @@ #include "ppapi/proxy/ppp_mouse_lock_proxy.h" -#include "ppapi/c/dev/ppp_mouse_lock_dev.h" +#include "ppapi/c/ppp_mouse_lock.h" #include "ppapi/proxy/host_dispatcher.h" #include "ppapi/proxy/ppapi_messages.h" @@ -22,10 +22,10 @@ void MouseLockLost(PP_Instance instance) { } dispatcher->Send(new PpapiMsg_PPPMouseLock_MouseLockLost( - INTERFACE_ID_PPP_MOUSE_LOCK_DEV, instance)); + INTERFACE_ID_PPP_MOUSE_LOCK, instance)); } -static const PPP_MouseLock_Dev mouse_lock_interface = { +static const PPP_MouseLock mouse_lock_interface = { &MouseLockLost }; @@ -38,8 +38,8 @@ InterfaceProxy* CreateMouseLockProxy(Dispatcher* dispatcher) { PPP_MouseLock_Proxy::PPP_MouseLock_Proxy(Dispatcher* dispatcher) : InterfaceProxy(dispatcher) { if (dispatcher->IsPlugin()) { - ppp_mouse_lock_impl_ = static_cast<const PPP_MouseLock_Dev*>( - dispatcher->local_get_interface()(PPP_MOUSELOCK_DEV_INTERFACE)); + ppp_mouse_lock_impl_ = static_cast<const PPP_MouseLock*>( + dispatcher->local_get_interface()(PPP_MOUSELOCK_INTERFACE)); } } @@ -50,8 +50,8 @@ PPP_MouseLock_Proxy::~PPP_MouseLock_Proxy() { const InterfaceProxy::Info* PPP_MouseLock_Proxy::GetInfo() { static const Info info = { &mouse_lock_interface, - PPP_MOUSELOCK_DEV_INTERFACE, - INTERFACE_ID_PPP_MOUSE_LOCK_DEV, + PPP_MOUSELOCK_INTERFACE, + INTERFACE_ID_PPP_MOUSE_LOCK, false, &CreateMouseLockProxy, }; diff --git a/ppapi/proxy/ppp_mouse_lock_proxy.h b/ppapi/proxy/ppp_mouse_lock_proxy.h index 752e97a..75a84f7 100644 --- a/ppapi/proxy/ppp_mouse_lock_proxy.h +++ b/ppapi/proxy/ppp_mouse_lock_proxy.h @@ -8,7 +8,7 @@ #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" -struct PPP_MouseLock_Dev; +struct PPP_MouseLock; namespace ppapi { namespace proxy { @@ -30,7 +30,7 @@ class PPP_MouseLock_Proxy : public InterfaceProxy { // When this proxy is in the plugin side, this value caches the interface // pointer so we don't have to retrieve it from the dispatcher each time. // In the host, this value is always NULL. - const PPP_MouseLock_Dev* ppp_mouse_lock_impl_; + const PPP_MouseLock* ppp_mouse_lock_impl_; DISALLOW_COPY_AND_ASSIGN(PPP_MouseLock_Proxy); }; |