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

Side by Side Diff: content/renderer/child_frame_compositing_helper.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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHILD_FRAME_COMPOSITING_HELPER_H_ 5 #ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
6 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ 6 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void OnContainerDestroy(); 67 void OnContainerDestroy();
68 void OnCompositorFrameSwapped(scoped_ptr<cc::CompositorFrame> frame, 68 void OnCompositorFrameSwapped(scoped_ptr<cc::CompositorFrame> frame,
69 int route_id, 69 int route_id,
70 uint32 output_surface_id, 70 uint32 output_surface_id,
71 int host_id, 71 int host_id,
72 base::SharedMemoryHandle handle); 72 base::SharedMemoryHandle handle);
73 void UpdateVisibility(bool); 73 void UpdateVisibility(bool);
74 void ChildFrameGone(); 74 void ChildFrameGone();
75 75
76 // cc::DelegatedFrameProviderClient implementation. 76 // cc::DelegatedFrameProviderClient implementation.
77 virtual void UnusedResourcesAreAvailable() OVERRIDE; 77 virtual void UnusedResourcesAreAvailable() override;
78 void SetContentsOpaque(bool); 78 void SetContentsOpaque(bool);
79 79
80 protected: 80 protected:
81 // Friend RefCounted so that the dtor can be non-public. 81 // Friend RefCounted so that the dtor can be non-public.
82 friend class base::RefCounted<ChildFrameCompositingHelper>; 82 friend class base::RefCounted<ChildFrameCompositingHelper>;
83 83
84 private: 84 private:
85 ChildFrameCompositingHelper( 85 ChildFrameCompositingHelper(
86 const base::WeakPtr<BrowserPlugin>& browser_plugin, 86 const base::WeakPtr<BrowserPlugin>& browser_plugin,
87 blink::WebFrame* frame, 87 blink::WebFrame* frame,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_; 129 scoped_refptr<cc::DelegatedRendererLayer> delegated_layer_;
130 scoped_ptr<blink::WebLayer> web_layer_; 130 scoped_ptr<blink::WebLayer> web_layer_;
131 blink::WebFrame* frame_; 131 blink::WebFrame* frame_;
132 132
133 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper); 133 DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
134 }; 134 };
135 135
136 } // namespace content 136 } // namespace content
137 137
138 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_ 138 #endif // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
OLDNEW
« no previous file with comments | « content/renderer/browser_render_view_browsertest.cc ('k') | content/renderer/device_sensors/device_light_event_pump.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698