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/thunk | |
| 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/thunk')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_public_dev.h | 2 | ||||
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_public_stable.h | 1 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_mouse_lock_thunk.cc | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h index 81e4fb9..93ebce9 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/ppapi/thunk/interfaces_ppb_public_dev.h @@ -41,8 +41,6 @@ PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_DEV_INTERFACE_0_5, PROXIED_IFACE(PPB_Font, PPB_FONT_DEV_INTERFACE_0_6, PPB_Font_Dev) PROXIED_IFACE(PPB_Instance, PPB_CHAR_SET_DEV_INTERFACE_0_4, PPB_CharSet_Dev) PROXIED_IFACE(PPB_Instance, PPB_CONSOLE_DEV_INTERFACE, PPB_Console_Dev) -PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_DEV_INTERFACE_0_1, - PPB_MouseLock_Dev) UNPROXIED_IFACE(PPB_Instance, PPB_QUERYPOLICY_DEV_INTERFACE_0_1, PPB_QueryPolicy_Dev) PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev) diff --git a/ppapi/thunk/interfaces_ppb_public_stable.h b/ppapi/thunk/interfaces_ppb_public_stable.h index 815a2b1..1a91038 100644 --- a/ppapi/thunk/interfaces_ppb_public_stable.h +++ b/ppapi/thunk/interfaces_ppb_public_stable.h @@ -70,6 +70,7 @@ PROXIED_IFACE(NoAPIName, PPB_WHEEL_INPUT_EVENT_INTERFACE_1_0, PPB_WheelInputEvent) PROXIED_IFACE(PPB_Instance, PPB_FULLSCREEN_INTERFACE_1_0, PPB_Fullscreen) PROXIED_IFACE(PPB_Instance, PPB_MESSAGING_INTERFACE_1_0, PPB_Messaging) +PROXIED_IFACE(PPB_Instance, PPB_MOUSELOCK_INTERFACE_1_0, PPB_MouseLock) PROXIED_IFACE(PPB_URLLoader, PPB_URLLOADER_INTERFACE_1_0, PPB_URLLoader) PROXIED_IFACE(NoAPIName, PPB_URLREQUESTINFO_INTERFACE_1_0, PPB_URLRequestInfo) PROXIED_IFACE(PPB_URLResponseInfo, PPB_URLRESPONSEINFO_INTERFACE_1_0, diff --git a/ppapi/thunk/ppb_mouse_lock_thunk.cc b/ppapi/thunk/ppb_mouse_lock_thunk.cc index 3f1d6d3..a26e789 100644 --- a/ppapi/thunk/ppb_mouse_lock_thunk.cc +++ b/ppapi/thunk/ppb_mouse_lock_thunk.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/c/dev/ppb_mouse_lock_dev.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_mouse_lock.h" #include "ppapi/thunk/common.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_instance_api.h" @@ -29,14 +29,14 @@ void UnlockMouse(PP_Instance instance) { enter.functions()->UnlockMouse(instance); } -const PPB_MouseLock_Dev g_ppb_mouse_lock_thunk = { +const PPB_MouseLock g_ppb_mouse_lock_thunk = { &LockMouse, &UnlockMouse }; } // namespace -const PPB_MouseLock_Dev* GetPPB_MouseLock_Dev_Thunk() { +const PPB_MouseLock* GetPPB_MouseLock_Thunk() { return &g_ppb_mouse_lock_thunk; } |