summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 18:15:52 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 18:15:52 +0000
commit0bd753681a82634f322d4867b19148474c25566b (patch)
tree2f96cb4494c075ddee5a3e42e6b41c096a5357a9 /chrome/browser/renderer_host
parentd1d0afe664ff43825a4585f88ee8ce412eab0194 (diff)
downloadchromium_src-0bd753681a82634f322d4867b19148474c25566b.zip
chromium_src-0bd753681a82634f322d4867b19148474c25566b.tar.gz
chromium_src-0bd753681a82634f322d4867b19148474c25566b.tar.bz2
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
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc2
-rw-r--r--chrome/browser/renderer_host/pepper_file_message_filter.cc4
-rw-r--r--chrome/browser/renderer_host/pepper_file_message_filter.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 570298a..dcad1e8 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -89,7 +89,7 @@
#include "ipc/ipc_switches.h"
#include "media/base/media_switches.h"
#include "webkit/fileapi/file_system_path_manager.h"
-#include "webkit/glue/plugins/plugin_switches.h"
+#include "webkit/plugins/plugin_switches.h"
#if defined(OS_WIN)
#include "app/win_util.h"
diff --git a/chrome/browser/renderer_host/pepper_file_message_filter.cc b/chrome/browser/renderer_host/pepper_file_message_filter.cc
index 62fad79..8c30300 100644
--- a/chrome/browser/renderer_host/pepper_file_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper_file_message_filter.cc
@@ -164,7 +164,7 @@ void PepperFileMessageFilter::OnPepperQueryFile(
void PepperFileMessageFilter::OnPepperGetDirContents(
const FilePath& path,
- PepperDirContents* contents,
+ webkit::ppapi::DirContents* contents,
base::PlatformFileError* error) {
FilePath full_path = MakePepperPath(path);
if (full_path.empty()) {
@@ -184,7 +184,7 @@ void PepperFileMessageFilter::OnPepperGetDirContents(
while (!enumerator.Next().empty()) {
file_util::FileEnumerator::FindInfo info;
enumerator.GetFindInfo(&info);
- PepperDirEntry entry = {
+ webkit::ppapi::DirEntry entry = {
file_util::FileEnumerator::GetFilename(info),
file_util::FileEnumerator::IsDirectory(info)
};
diff --git a/chrome/browser/renderer_host/pepper_file_message_filter.h b/chrome/browser/renderer_host/pepper_file_message_filter.h
index d3cbfdc..fbcd5e5 100644
--- a/chrome/browser/renderer_host/pepper_file_message_filter.h
+++ b/chrome/browser/renderer_host/pepper_file_message_filter.h
@@ -16,7 +16,7 @@
#include "build/build_config.h"
#include "chrome/browser/browser_message_filter.h"
#include "ipc/ipc_platform_file.h"
-#include "webkit/glue/plugins/pepper_dir_contents.h"
+#include "webkit/plugins/ppapi/dir_contents.h"
class Profile;
@@ -54,7 +54,7 @@ class PepperFileMessageFilter : public BrowserMessageFilter {
base::PlatformFileInfo* info,
base::PlatformFileError* error);
void OnPepperGetDirContents(const FilePath& path,
- PepperDirContents* contents,
+ webkit::ppapi::DirContents* contents,
base::PlatformFileError* error);
FilePath MakePepperPath(const FilePath& base_path);