Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2333)

Unified Diff: chrome/renderer/render_widget_fullscreen_pepper.cc

Issue 5828003: Move the Pepper implementation from webkit/glue/plugins/pepper_* to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/render_widget_fullscreen_pepper.h ('k') | chrome/test/ui/ppapi_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_widget_fullscreen_pepper.cc
===================================================================
--- chrome/renderer/render_widget_fullscreen_pepper.cc (revision 69381)
+++ chrome/renderer/render_widget_fullscreen_pepper.cc (working copy)
@@ -9,8 +9,8 @@
#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
#include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
#include "third_party/WebKit/WebKit/chromium/public/WebWidget.h"
-#include "webkit/glue/plugins/pepper_fullscreen_container.h"
-#include "webkit/glue/plugins/pepper_plugin_instance.h"
+#include "webkit/plugins/ppapi/fullscreen_container.h"
+#include "webkit/plugins/ppapi/plugin_instance.h"
using WebKit::WebCanvas;
using WebKit::WebCompositionUnderline;
@@ -29,7 +29,7 @@
// WebWidget that simply wraps the pepper plugin.
class PepperWidget : public WebWidget {
public:
- PepperWidget(pepper::PluginInstance* plugin,
+ PepperWidget(webkit::ppapi::PluginInstance* plugin,
RenderWidgetFullscreenPepper* widget)
: plugin_(plugin),
widget_(widget),
@@ -119,7 +119,7 @@
}
private:
- pepper::PluginInstance* plugin_;
+ webkit::ppapi::PluginInstance* plugin_;
RenderWidgetFullscreenPepper* widget_;
WebSize size_;
WebCursorInfo cursor_;
@@ -130,7 +130,8 @@
// A FullscreenContainer that forwards the API calls to the
// RenderWidgetFullscreenPepper.
-class WidgetFullscreenContainer : public pepper::FullscreenContainer {
+class WidgetFullscreenContainer
+ : public webkit::ppapi::FullscreenContainer {
public:
explicit WidgetFullscreenContainer(RenderWidgetFullscreenPepper* widget)
: widget_(widget) {
@@ -164,7 +165,7 @@
// static
RenderWidgetFullscreenPepper* RenderWidgetFullscreenPepper::Create(
int32 opener_id, RenderThreadBase* render_thread,
- pepper::PluginInstance* plugin) {
+ webkit::ppapi::PluginInstance* plugin) {
DCHECK_NE(MSG_ROUTING_NONE, opener_id);
scoped_refptr<RenderWidgetFullscreenPepper> widget(
new RenderWidgetFullscreenPepper(render_thread, plugin));
@@ -173,7 +174,8 @@
}
RenderWidgetFullscreenPepper::RenderWidgetFullscreenPepper(
- RenderThreadBase* render_thread, pepper::PluginInstance* plugin)
+ RenderThreadBase* render_thread,
+ webkit::ppapi::PluginInstance* plugin)
: RenderWidgetFullscreen(render_thread, WebKit::WebPopupTypeSelect),
plugin_(plugin),
ALLOW_THIS_IN_INITIALIZER_LIST(
Property changes on: chrome/renderer/render_widget_fullscreen_pepper.cc
___________________________________________________________________
Added: svn:eol-style
+ LF
« no previous file with comments | « chrome/renderer/render_widget_fullscreen_pepper.h ('k') | chrome/test/ui/ppapi_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698