Index: webkit/plugins/ppapi/webplugin_impl.cc |
=================================================================== |
--- webkit/plugins/ppapi/webplugin_impl.cc (revision 0) |
+++ webkit/plugins/ppapi/webplugin_impl.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/glue/plugins/pepper_webplugin_impl.h" |
+#include "webkit/plugins/ppapi/webplugin_impl.h" |
#include <cmath> |
@@ -12,10 +12,10 @@ |
#include "third_party/WebKit/WebKit/chromium/public/WebPoint.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" |
#include "third_party/WebKit/WebKit/chromium/public/WebView.h" |
-#include "webkit/glue/plugins/pepper_plugin_instance.h" |
-#include "webkit/glue/plugins/pepper_plugin_module.h" |
-#include "webkit/glue/plugins/pepper_url_loader.h" |
-#include "webkit/glue/plugins/pepper_var.h" |
+#include "webkit/plugins/ppapi/plugin_instance.h" |
+#include "webkit/plugins/ppapi/plugin_module.h" |
+#include "webkit/plugins/ppapi/ppb_url_loader_impl.h" |
+#include "webkit/plugins/ppapi/var.h" |
using WebKit::WebCanvas; |
using WebKit::WebPluginContainer; |
@@ -27,7 +27,8 @@ |
using WebKit::WebVector; |
using WebKit::WebView; |
-namespace pepper { |
+namespace webkit { |
+namespace ppapi { |
struct WebPluginImpl::InitData { |
scoped_refptr<PluginModule> module; |
@@ -135,7 +136,7 @@ |
const WebKit::WebURLResponse& response) { |
DCHECK(!document_loader_); |
- document_loader_ = new URLLoader(instance_, true); |
+ document_loader_ = new PPB_URLLoader_Impl(instance_, true); |
document_loader_->didReceiveResponse(NULL, response); |
if (!instance_->HandleDocumentLoad(document_loader_)) |
@@ -223,4 +224,6 @@ |
return instance_->PrintEnd(); |
} |
-} // namespace pepper |
+} // namespace ppapi |
+} // namespace webkit |
+ |