Move the Pepper implementation from webkit/glue/plugins/pepper_* to

webkit/plugins/ppapi/*. This renamed the files and interface implementation
classes from foo.cc/Foo to ppb_foo_impl/PPB_Foo_Impl to match the proxy
ppb_foo_proxy/PPB_Foo_Proxy.

This moves plugin_switches.* from webkit/glue/plugins to webkit/plugins.
Review URL: http://codereview.chromium.org/5828003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69424 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 35 insertions, 35 deletions

diff --git a/ppapi/proxy/DEPS b/ppapi/proxy/DEPS
index 7ef8f98..fd6f58c 100644
--- a/ppapi/proxy/DEPS
+++ b/ppapi/proxy/DEPS
@@ -5,8 +5,8 @@ include_rules = [
   # These files are really Chrome-only and we don't want to expose them, but
   # we need to use them for the proxy. Allow the code here to pull these
   # headers (which don't depend on anything else).
-  "+webkit/glue/plugins/ppb_private.h",
-  "+webkit/glue/plugins/ppb_private2.h",
+  "+webkit/plugins/ppapi/ppb_pdf.h",
+  "+webkit/plugins/ppapi/ppb_flash.h",
 
   # We don't want the proxy to depend on the C++ layer, which is appropriate
   # for plugins only. However, the completion callback factory is a very useful
diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc
index 3f18877..9b7958c 100644
--- a/ppapi/proxy/dispatcher.cc
+++ b/ppapi/proxy/dispatcher.cc
@@ -55,8 +55,8 @@
 #include "ppapi/proxy/ppp_class_proxy.h"
 #include "ppapi/proxy/ppp_instance_proxy.h"
 #include "ppapi/proxy/var_serialization_rules.h"
-#include "webkit/glue/plugins/ppb_private.h"
-#include "webkit/glue/plugins/ppb_private2.h"
+#include "webkit/plugins/ppapi/ppb_pdf.h"
+#include "webkit/plugins/ppapi/ppb_flash.h"
 
 namespace pp {
 namespace proxy {
@@ -262,10 +262,10 @@ InterfaceProxy* Dispatcher::CreateProxyForInterface(
 
   // Trusted interfaces.
   if (!disallow_trusted_interfaces_) {
-    if (interface_name == PPB_PRIVATE2_INTERFACE)
+    if (interface_name == PPB_FLASH_INTERFACE)
       return new PPB_Flash_Proxy(this, interface_functions);
-    if (interface_name == PPB_PRIVATE_INTERFACE)
-      return new PPB_Pdf_Proxy(this, interface_functions);
+    if (interface_name == PPB_PDF_INTERFACE)
+      return new PPB_PDF_Proxy(this, interface_functions);
     if (interface_name == PPB_URLLOADERTRUSTED_INTERFACE)
       return new PPB_URLLoaderTrusted_Proxy(this, interface_functions);
   }
diff --git a/ppapi/proxy/ppapi_messages_internal.h b/ppapi/proxy/ppapi_messages_internal.h
index e9542a2..f593aea 100644
--- a/ppapi/proxy/ppapi_messages_internal.h
+++ b/ppapi/proxy/ppapi_messages_internal.h
@@ -377,13 +377,13 @@ IPC_SYNC_MESSAGE_ROUTED2_2(PpapiHostMsg_PPBInstance_ExecuteScript,
                            pp::proxy::SerializedVar /* result */)
 
 IPC_SYNC_MESSAGE_ROUTED3_1(
-    PpapiHostMsg_PPBPdf_GetFontFileWithFallback,
+    PpapiHostMsg_PPBPDF_GetFontFileWithFallback,
     PP_Module /* module */,
     pp::proxy::SerializedFontDescription /* description */,
     int32_t /* charset */,
     PP_Resource /* result */)
 IPC_SYNC_MESSAGE_ROUTED2_1(
-    PpapiHostMsg_PPBPdf_GetFontTableForPrivateFontFile,
+    PpapiHostMsg_PPBPDF_GetFontTableForPrivateFontFile,
     PP_Resource /* font_file */,
     uint32_t /* table */,
     std::string /* result */)
diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc
index 248ebe9..5614e6a 100644
--- a/ppapi/proxy/ppb_flash_proxy.cc
+++ b/ppapi/proxy/ppb_flash_proxy.cc
@@ -15,7 +15,7 @@
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
-#include "webkit/glue/plugins/ppb_private2.h"
+#include "webkit/plugins/ppapi/ppb_flash.h"
 
 namespace pp {
 namespace proxy {
@@ -192,7 +192,7 @@ bool NavigateToURL(PP_Instance pp_instance,
   return result;
 }
 
-const PPB_Private2 ppb_flash = {
+const PPB_Flash ppb_flash = {
   &SetInstanceAlwaysOnTop,
   &DrawGlyphs,
   &GetProxyForURL,
diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h
index 11eb0fc..8961a47 100644
--- a/ppapi/proxy/ppb_flash_proxy.h
+++ b/ppapi/proxy/ppb_flash_proxy.h
@@ -13,7 +13,7 @@
 #include "ppapi/proxy/interface_proxy.h"
 
 struct PP_FileInfo_Dev;
-struct PPB_Private2;
+struct PPB_Flash;
 
 namespace pp {
 namespace proxy {
@@ -28,8 +28,8 @@ class PPB_Flash_Proxy : public InterfaceProxy {
   PPB_Flash_Proxy(Dispatcher* dispatcher, const void* target_interface);
   virtual ~PPB_Flash_Proxy();
 
-  const PPB_Private2* ppb_flash_target() const {
-    return static_cast<const PPB_Private2*>(target_interface());
+  const PPB_Flash* ppb_flash_target() const {
+    return static_cast<const PPB_Flash*>(target_interface());
   }
 
   // InterfaceProxy implementation.
diff --git a/ppapi/proxy/ppb_pdf_proxy.cc b/ppapi/proxy/ppb_pdf_proxy.cc
index 580c6b0..0ba638e 100644
--- a/ppapi/proxy/ppb_pdf_proxy.cc
+++ b/ppapi/proxy/ppb_pdf_proxy.cc
@@ -14,7 +14,7 @@
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "webkit/glue/plugins/ppb_private.h"
+#include "webkit/plugins/ppapi/ppb_pdf.h"
 
 namespace pp {
 namespace proxy {
@@ -65,7 +65,7 @@ PP_Resource GetFontFileWithFallback(
   desc.SetFromPPFontDescription(dispatcher, *description, true);
 
   PP_Resource result = 0;
-  dispatcher->Send(new PpapiHostMsg_PPBPdf_GetFontFileWithFallback(
+  dispatcher->Send(new PpapiHostMsg_PPBPDF_GetFontFileWithFallback(
       INTERFACE_ID_PPB_PDF, module_id, desc, charset, &result));
   if (!result)
     return 0;
@@ -87,7 +87,7 @@ bool GetFontTableForPrivateFontFile(PP_Resource font_file,
   if (!contents) {
     std::string deserialized;
     PluginDispatcher::Get()->Send(
-        new PpapiHostMsg_PPBPdf_GetFontTableForPrivateFontFile(
+        new PpapiHostMsg_PPBPDF_GetFontTableForPrivateFontFile(
             INTERFACE_ID_PPB_PDF, font_file, table, &deserialized));
     if (deserialized.empty())
       return false;
@@ -100,7 +100,7 @@ bool GetFontTableForPrivateFontFile(PP_Resource font_file,
   return true;
 }
 
-const PPB_Private ppb_private = {
+const PPB_PDF ppb_pdf = {
   NULL,  // &GetLocalizedString,
   NULL,  // &GetResourceImage,
   &GetFontFileWithFallback,
@@ -109,33 +109,33 @@ const PPB_Private ppb_private = {
 
 }  // namespace
 
-PPB_Pdf_Proxy::PPB_Pdf_Proxy(Dispatcher* dispatcher,
+PPB_PDF_Proxy::PPB_PDF_Proxy(Dispatcher* dispatcher,
                              const void* target_interface)
     : InterfaceProxy(dispatcher, target_interface) {
 }
 
-PPB_Pdf_Proxy::~PPB_Pdf_Proxy() {
+PPB_PDF_Proxy::~PPB_PDF_Proxy() {
 }
 
-const void* PPB_Pdf_Proxy::GetSourceInterface() const {
-  return &ppb_private;
+const void* PPB_PDF_Proxy::GetSourceInterface() const {
+  return &ppb_pdf;
 }
 
-InterfaceID PPB_Pdf_Proxy::GetInterfaceId() const {
+InterfaceID PPB_PDF_Proxy::GetInterfaceId() const {
   return INTERFACE_ID_PPB_PDF;
 }
 
-void PPB_Pdf_Proxy::OnMessageReceived(const IPC::Message& msg) {
-  IPC_BEGIN_MESSAGE_MAP(PPB_Pdf_Proxy, msg)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBPdf_GetFontFileWithFallback,
+void PPB_PDF_Proxy::OnMessageReceived(const IPC::Message& msg) {
+  IPC_BEGIN_MESSAGE_MAP(PPB_PDF_Proxy, msg)
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBPDF_GetFontFileWithFallback,
                         OnMsgGetFontFileWithFallback)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBPdf_GetFontTableForPrivateFontFile,
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBPDF_GetFontTableForPrivateFontFile,
                         OnMsgGetFontTableForPrivateFontFile)
   IPC_END_MESSAGE_MAP()
   // TODO(brettw): handle bad messages!
 }
 
-void PPB_Pdf_Proxy::OnMsgGetFontFileWithFallback(
+void PPB_PDF_Proxy::OnMsgGetFontFileWithFallback(
     PP_Module module,
     const SerializedFontDescription& in_desc,
     int32_t charset,
@@ -146,7 +146,7 @@ void PPB_Pdf_Proxy::OnMsgGetFontFileWithFallback(
       static_cast<PP_PrivateFontCharset>(charset));
 }
 
-void PPB_Pdf_Proxy::OnMsgGetFontTableForPrivateFontFile(PP_Resource font_file,
+void PPB_PDF_Proxy::OnMsgGetFontTableForPrivateFontFile(PP_Resource font_file,
                                                         uint32_t table,
                                                         std::string* result) {
   // TODO(brettw): It would be nice not to copy here. At least on Linux,
diff --git a/ppapi/proxy/ppb_pdf_proxy.h b/ppapi/proxy/ppb_pdf_proxy.h
index 43b90d6..f229df2 100644
--- a/ppapi/proxy/ppb_pdf_proxy.h
+++ b/ppapi/proxy/ppb_pdf_proxy.h
@@ -8,20 +8,20 @@
 #include "ppapi/c/pp_module.h"
 #include "ppapi/proxy/interface_proxy.h"
 
-struct PPB_Private;
+struct PPB_PDF;
 
 namespace pp {
 namespace proxy {
 
 struct SerializedFontDescription;
 
-class PPB_Pdf_Proxy : public InterfaceProxy {
+class PPB_PDF_Proxy : public InterfaceProxy {
  public:
-  PPB_Pdf_Proxy(Dispatcher* dispatcher, const void* target_interface);
-  virtual ~PPB_Pdf_Proxy();
+  PPB_PDF_Proxy(Dispatcher* dispatcher, const void* target_interface);
+  virtual ~PPB_PDF_Proxy();
 
-  const PPB_Private* ppb_pdf_target() const {
-    return static_cast<const PPB_Private*>(target_interface());
+  const PPB_PDF* ppb_pdf_target() const {
+    return static_cast<const PPB_PDF*>(target_interface());
   }
 
   // InterfaceProxy implementation.