Move ppb_flash.h to ppapi/c/private ...

... from webkit/plugins/ppapi.

BUG=none
TEST=builds
Review URL: http://codereview.chromium.org/6141001

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

3 files changed, 4 insertions, 121 deletions

diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 6fb24cc..11d0593 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -47,6 +47,7 @@
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/c/private/ppb_nacl_private.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
@@ -63,7 +64,6 @@
 #include "webkit/plugins/ppapi/ppb_file_io_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_system_impl.h"
-#include "webkit/plugins/ppapi/ppb_flash.h"
 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
diff --git a/webkit/plugins/ppapi/ppb_flash.h b/webkit/plugins/ppapi/ppb_flash.h
deleted file mode 100644
index 607adcd..0000000
--- a/webkit/plugins/ppapi/ppb_flash.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2010 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.
-
-#ifndef WEBKIT_PLUGINS_PEPPER_PPB_FLASH_H_
-#define WEBKIT_PLUGINS_PEPPER_PPB_FLASH_H_
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_module.h"
-#include "ppapi/c/pp_point.h"
-#include "ppapi/c/pp_rect.h"
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_var.h"
-
-#define PPB_FLASH_INTERFACE "PPB_Flash;1"
-
-#ifdef _WIN32
-typedef HANDLE PP_FileHandle;
-static const PP_FileHandle PP_kInvalidFileHandle = NULL;
-#else
-typedef int PP_FileHandle;
-static const PP_FileHandle PP_kInvalidFileHandle = -1;
-#endif
-
-struct PP_FontDescription_Dev;
-struct PP_FileInfo_Dev;
-
-struct PP_DirEntry_Dev {
-  const char* name;
-  bool is_dir;
-};
-
-struct PP_DirContents_Dev {
-  int32_t count;
-  PP_DirEntry_Dev* entries;
-};
-
-struct PPB_Flash {
-  // Sets or clears the rendering hint that the given plugin instance is always
-  // on top of page content. Somewhat more optimized painting can be used in
-  // this case.
-  void (*SetInstanceAlwaysOnTop)(PP_Instance instance, bool on_top);
-
-  bool (*DrawGlyphs)(PP_Resource pp_image_data,
-                     const PP_FontDescription_Dev* font_desc,
-                     uint32_t color,
-                     PP_Point position,
-                     PP_Rect clip,
-                     const float transformation[3][3],
-                     uint32_t glyph_count,
-                     const uint16_t glyph_indices[],
-                     const PP_Point glyph_advances[]);
-
-  // Retrieves the proxy that will be used for the given URL. The result will
-  // be a string in PAC format, or an undefined var on error.
-  PP_Var (*GetProxyForURL)(PP_Module module, const char* url);
-
-  // Opens a module-local file, returning a file descriptor (posix) or a HANDLE
-  // (win32) into file. Module-local file paths (here and below) are
-  // '/'-separated UTF-8 strings, relative to a module-specific root. The return
-  // value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in case
-  // of failure.
-  int32_t (*OpenModuleLocalFile)(PP_Module module,
-                                 const char* path,
-                                 int32_t mode,
-                                 PP_FileHandle* file);
-
-  // Renames a module-local file. The return value is the ppapi error, PP_OK if
-  // success, one of the PP_ERROR_* in case of failure.
-  int32_t (*RenameModuleLocalFile)(PP_Module module,
-                                   const char* path_from,
-                                   const char* path_to);
-
-  // Deletes a module-local file or directory. If recursive is set and the path
-  // points to a directory, deletes all the contents of the directory. The
-  // return value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in
-  // case of failure.
-  int32_t (*DeleteModuleLocalFileOrDir)(PP_Module module,
-                                        const char* path,
-                                        bool recursive);
-
-  // Creates a module-local directory. The return value is the ppapi error,
-  // PP_OK if success, one of the PP_ERROR_* in case of failure.
-  int32_t (*CreateModuleLocalDir)(PP_Module module, const char* path);
-
-  // Queries information about a module-local file. The return value is the
-  // ppapi error, PP_OK if success, one of the PP_ERROR_* in case of failure.
-  int32_t (*QueryModuleLocalFile)(PP_Module module,
-                                  const char* path,
-                                  PP_FileInfo_Dev* info);
-
-  // Gets the list of files contained in a module-local directory. The return
-  // value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in case
-  // of failure. If non-NULL, the returned contents should be freed with
-  // FreeModuleLocalDirContents.
-  int32_t (*GetModuleLocalDirContents)(PP_Module module,
-                                       const char* path,
-                                       PP_DirContents_Dev** contents);
-
-  // Frees the data allocated by GetModuleLocalDirContents.
-  void (*FreeModuleLocalDirContents)(PP_Module module,
-                                     PP_DirContents_Dev* contents);
-
-  // Navigate to URL. May open a new tab if target is not "_self". Return true
-  // if success. This differs from javascript:window.open() in that it bypasses
-  // the popup blocker, even when this is not called from an event handler.
-  bool (*NavigateToURL)(PP_Instance instance,
-                        const char* url,
-                        const char* target);
-};
-
-#endif  // WEBKIT_GLUE_PLUGINS_PPB_FLASH_H_
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc
index b6340df..f48a71b 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.cc
+++ b/webkit/plugins/ppapi/ppb_flash_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -12,11 +12,11 @@
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_file_info_dev.h"
 #include "ppapi/c/dev/ppb_file_io_dev.h"
+#include "ppapi/c/private/ppb_flash.h"
 #include "webkit/plugins/ppapi/error_util.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
-#include "webkit/plugins/ppapi/ppb_flash.h"
 #include "webkit/plugins/ppapi/var.h"
 
 namespace webkit {