Move PPB/PPP_MouseLock out of dev/.

ppapi/native_client/src/trusted/plugin/plugin.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 #include "native_client/src/trusted/plugin/plugin.h"
@@ skipping 35 matching lines @@
 #include "native_client/src/trusted/plugin/nexe_arch.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
 #include "native_client/src/trusted/plugin/scriptable_handle.h"
 #include "native_client/src/trusted/plugin/service_runtime.h"
 #include "native_client/src/trusted/plugin/string_encoding.h"
 #include "native_client/src/trusted/plugin/utility.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_code.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"
 #include "ppapi/c/dev/ppp_widget_dev.h"
 #include "ppapi/c/dev/ppp_zoom_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/c/private/ppb_uma_private.h"
 #include "ppapi/cpp/dev/find_dev.h"
-#include "ppapi/cpp/dev/mouse_lock_dev.h"
 #include "ppapi/cpp/dev/printing_dev.h"
 #include "ppapi/cpp/dev/scrollbar_dev.h"
 #include "ppapi/cpp/dev/selection_dev.h"
 #include "ppapi/cpp/dev/url_util_dev.h"
 #include "ppapi/cpp/dev/widget_client_dev.h"
 #include "ppapi/cpp/dev/zoom_dev.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/module.h"
+#include "ppapi/cpp/mouse_lock.h"
 #include "ppapi/cpp/rect.h"
 
 using ppapi_proxy::BrowserPpp;
 
 namespace plugin {
 
 namespace {
 
 bool GetReadyStateProperty(void* obj, SrpcParams* params) {
   Plugin* plugin = static_cast<Plugin*>(obj);
@@ skipping 212 matching lines @@
   }
 
  private:
   Plugin* plugin_;
   const PPP_Find_Dev* ppp_find_;
 
   NACL_DISALLOW_COPY_AND_ASSIGN(FindAdapter);
 };
 
 
-// Derive a class from pp::MouseLock_Dev to forward PPP_MouseLock_Dev calls to
+// Derive a class from pp::MouseLock to forward PPP_MouseLock calls to
 // the plugin.
-class MouseLockAdapter : public pp::MouseLock_Dev {
+class MouseLockAdapter : public pp::MouseLock {
  public:
   explicit MouseLockAdapter(Plugin* plugin)
-    : pp::MouseLock_Dev(plugin),
+    : pp::MouseLock(plugin),
       plugin_(plugin) {
     BrowserPpp* proxy = plugin_->ppapi_proxy();
     CHECK(proxy != NULL);
-    ppp_mouse_lock_ = static_cast<const PPP_MouseLock_Dev*>(
-        proxy->GetPluginInterface(PPP_MOUSELOCK_DEV_INTERFACE));
+    ppp_mouse_lock_ = static_cast<const PPP_MouseLock*>(
+        proxy->GetPluginInterface(PPP_MOUSELOCK_INTERFACE));
   }
 
   void MouseLockLost() {
     if (ppp_mouse_lock_ != NULL)
       ppp_mouse_lock_->MouseLockLost(plugin_->pp_instance());
   }
 
  private:
   Plugin* plugin_;
-  const PPP_MouseLock_Dev* ppp_mouse_lock_;
+  const PPP_MouseLock* ppp_mouse_lock_;
 
   NACL_DISALLOW_COPY_AND_ASSIGN(MouseLockAdapter);
 };
 
 
 // Derive a class from pp::Printing_Dev to forward PPP_Printing_Dev calls to
 // the plugin.
 class PrintingAdapter : public pp::Printing_Dev {
  public:
   explicit PrintingAdapter(Plugin* plugin)
@@ skipping 1668 matching lines @@
   std::string scheme = canonicalized.AsString().substr(comps.scheme.begin,
                                                        comps.scheme.len);
   if (scheme == kChromeExtensionUriScheme)
     return SCHEME_CHROME_EXTENSION;
   if (scheme == kDataUriScheme)
     return SCHEME_DATA;
   return SCHEME_OTHER;
 }
 
 }  // namespace plugin