| Index: chrome/renderer/render_widget_fullscreen_pepper.h
|
| ===================================================================
|
| --- chrome/renderer/render_widget_fullscreen_pepper.h (revision 69381)
|
| +++ chrome/renderer/render_widget_fullscreen_pepper.h (working copy)
|
| @@ -8,11 +8,15 @@
|
| #include "chrome/renderer/render_widget_fullscreen.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebWidget.h"
|
|
|
| -namespace pepper {
|
| +namespace webkit {
|
| +namespace ppapi {
|
| +
|
| class PluginInstance;
|
| class FullscreenContainer;
|
| -}
|
|
|
| +} // namespace ppapi
|
| +} // namespace webkit
|
| +
|
| // A RenderWidget that hosts a fullscreen pepper plugin. This provides a
|
| // FullscreenContainer that the plugin instance can callback into to e.g.
|
| // invalidate rects.
|
| @@ -21,7 +25,7 @@
|
| static RenderWidgetFullscreenPepper* Create(
|
| int32 opener_id,
|
| RenderThreadBase* render_thread,
|
| - pepper::PluginInstance* plugin);
|
| + webkit::ppapi::PluginInstance* plugin);
|
|
|
| // Asks the browser to close this view, which will tear off the window and
|
| // close this widget.
|
| @@ -30,11 +34,13 @@
|
| // Invalidate the whole widget to force a redraw.
|
| void GenerateFullRepaint();
|
|
|
| - pepper::FullscreenContainer* container() const { return container_.get(); }
|
| + webkit::ppapi::FullscreenContainer* container() const {
|
| + return container_.get();
|
| + }
|
|
|
| protected:
|
| RenderWidgetFullscreenPepper(RenderThreadBase* render_thread,
|
| - pepper::PluginInstance* plugin);
|
| + webkit::ppapi::PluginInstance* plugin);
|
| virtual ~RenderWidgetFullscreenPepper();
|
|
|
| // RenderWidget API.
|
| @@ -52,10 +58,10 @@
|
|
|
| private:
|
| // The plugin instance this widget wraps.
|
| - pepper::PluginInstance* plugin_;
|
| + webkit::ppapi::PluginInstance* plugin_;
|
|
|
| // The FullscreenContainer that the plugin instance can callback into.
|
| - scoped_ptr<pepper::FullscreenContainer> container_;
|
| + scoped_ptr<webkit::ppapi::FullscreenContainer> container_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetFullscreenPepper);
|
| };
|
|
|
| Property changes on: chrome/renderer/render_widget_fullscreen_pepper.h
|
| ___________________________________________________________________
|
| Added: svn:eol-style
|
| + LF
|
|
|
|
|