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

Unified Diff: ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.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 side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc
index 69bdc1419c818b2e6b870b584e028aa02021fe89..d31de7824934ac69cfba6582d0db1136cf7345ad 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc
@@ -27,7 +27,6 @@
#include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
#include "native_client/src/trusted/plugin/plugin.h"
#include "ppapi/c/dev/ppp_find_dev.h"
-#include "ppapi/c/dev/ppp_mouse_lock_dev.h"
#include "ppapi/c/dev/ppp_printing_dev.h"
#include "ppapi/c/dev/ppp_scrollbar_dev.h"
#include "ppapi/c/dev/ppp_selection_dev.h"
@@ -36,6 +35,7 @@
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/ppp.h"
#include "ppapi/c/ppp_input_event.h"
+#include "ppapi/c/ppp_mouse_lock.h"
#include "ppapi/c/private/ppb_nacl_private.h"
namespace ppapi_proxy {
@@ -173,7 +173,7 @@ const void* BrowserPpp::GetPluginInterface(const char* interface_name) {
} else if (strcmp(interface_name, PPP_MESSAGING_INTERFACE) == 0) {
ppp_interface =
reinterpret_cast<const void*>(BrowserMessaging::GetInterface());
- } else if (strcmp(interface_name, PPP_MOUSELOCK_DEV_INTERFACE) == 0) {
+ } else if (strcmp(interface_name, PPP_MOUSELOCK_INTERFACE) == 0) {
ppp_interface =
reinterpret_cast<const void*>(BrowserMouseLock::GetInterface());
} else if (strcmp(interface_name, PPP_INPUT_EVENT_INTERFACE) == 0) {

Powered by Google App Engine
This is Rietveld 408576698