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

Side by Side Diff: content/renderer/render_widget_fullscreen_pepper.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/render_widget_fullscreen_pepper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ 5 #ifndef CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_
6 #define CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ 6 #define CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/renderer/mouse_lock_dispatcher.h" 9 #include "content/renderer/mouse_lock_dispatcher.h"
10 #include "content/renderer/pepper/fullscreen_container.h" 10 #include "content/renderer/pepper/fullscreen_container.h"
(...skipping 13 matching lines...) Expand all
24 class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, 24 class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
25 public FullscreenContainer { 25 public FullscreenContainer {
26 public: 26 public:
27 static RenderWidgetFullscreenPepper* Create( 27 static RenderWidgetFullscreenPepper* Create(
28 int32 opener_id, 28 int32 opener_id,
29 PepperPluginInstanceImpl* plugin, 29 PepperPluginInstanceImpl* plugin,
30 const GURL& active_url, 30 const GURL& active_url,
31 const blink::WebScreenInfo& screen_info); 31 const blink::WebScreenInfo& screen_info);
32 32
33 // pepper::FullscreenContainer API. 33 // pepper::FullscreenContainer API.
34 virtual void Invalidate() OVERRIDE; 34 virtual void Invalidate() override;
35 virtual void InvalidateRect(const blink::WebRect& rect) OVERRIDE; 35 virtual void InvalidateRect(const blink::WebRect& rect) override;
36 virtual void ScrollRect(int dx, int dy, const blink::WebRect& rect) OVERRIDE; 36 virtual void ScrollRect(int dx, int dy, const blink::WebRect& rect) override;
37 virtual void Destroy() OVERRIDE; 37 virtual void Destroy() override;
38 virtual void DidChangeCursor(const blink::WebCursorInfo& cursor) OVERRIDE; 38 virtual void DidChangeCursor(const blink::WebCursorInfo& cursor) override;
39 virtual void SetLayer(blink::WebLayer* layer) OVERRIDE; 39 virtual void SetLayer(blink::WebLayer* layer) override;
40 40
41 // IPC::Listener implementation. This overrides the implementation 41 // IPC::Listener implementation. This overrides the implementation
42 // in RenderWidgetFullscreen. 42 // in RenderWidgetFullscreen.
43 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; 43 virtual bool OnMessageReceived(const IPC::Message& msg) override;
44 44
45 // Could be NULL when this widget is closing. 45 // Could be NULL when this widget is closing.
46 PepperPluginInstanceImpl* plugin() const { return plugin_; } 46 PepperPluginInstanceImpl* plugin() const { return plugin_; }
47 47
48 MouseLockDispatcher* mouse_lock_dispatcher() const { 48 MouseLockDispatcher* mouse_lock_dispatcher() const {
49 return mouse_lock_dispatcher_.get(); 49 return mouse_lock_dispatcher_.get();
50 } 50 }
51 51
52 protected: 52 protected:
53 RenderWidgetFullscreenPepper(PepperPluginInstanceImpl* plugin, 53 RenderWidgetFullscreenPepper(PepperPluginInstanceImpl* plugin,
54 const GURL& active_url, 54 const GURL& active_url,
55 const blink::WebScreenInfo& screen_info); 55 const blink::WebScreenInfo& screen_info);
56 virtual ~RenderWidgetFullscreenPepper(); 56 virtual ~RenderWidgetFullscreenPepper();
57 57
58 // RenderWidget API. 58 // RenderWidget API.
59 virtual void DidInitiatePaint() OVERRIDE; 59 virtual void DidInitiatePaint() override;
60 virtual void DidFlushPaint() OVERRIDE; 60 virtual void DidFlushPaint() override;
61 virtual void Close() OVERRIDE; 61 virtual void Close() override;
62 virtual void OnResize(const ViewMsg_Resize_Params& params) OVERRIDE; 62 virtual void OnResize(const ViewMsg_Resize_Params& params) override;
63 63
64 // RenderWidgetFullscreen API. 64 // RenderWidgetFullscreen API.
65 virtual blink::WebWidget* CreateWebWidget() OVERRIDE; 65 virtual blink::WebWidget* CreateWebWidget() override;
66 66
67 // RenderWidget overrides. 67 // RenderWidget overrides.
68 virtual GURL GetURLForGraphicsContext3D() OVERRIDE; 68 virtual GURL GetURLForGraphicsContext3D() override;
69 virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE; 69 virtual void SetDeviceScaleFactor(float device_scale_factor) override;
70 70
71 private: 71 private:
72 // URL that is responsible for this widget, passed to ggl::CreateViewContext. 72 // URL that is responsible for this widget, passed to ggl::CreateViewContext.
73 GURL active_url_; 73 GURL active_url_;
74 74
75 // The plugin instance this widget wraps. 75 // The plugin instance this widget wraps.
76 PepperPluginInstanceImpl* plugin_; 76 PepperPluginInstanceImpl* plugin_;
77 77
78 blink::WebLayer* layer_; 78 blink::WebLayer* layer_;
79 79
80 scoped_ptr<MouseLockDispatcher> mouse_lock_dispatcher_; 80 scoped_ptr<MouseLockDispatcher> mouse_lock_dispatcher_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(RenderWidgetFullscreenPepper); 82 DISALLOW_COPY_AND_ASSIGN(RenderWidgetFullscreenPepper);
83 }; 83 };
84 84
85 } // namespace content 85 } // namespace content
86 86
87 #endif // CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ 87 #endif // CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_
OLDNEW
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/render_widget_fullscreen_pepper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698