Index: content/test/web_layer_tree_view_impl_for_testing.h |
diff --git a/content/test/web_layer_tree_view_impl_for_testing.h b/content/test/web_layer_tree_view_impl_for_testing.h |
index 72761c8ef7d83da26877f2bf863b6ca8fec25258..7162917e97de487238dc4caeaba995c3fb5e92fa 100644 |
--- a/content/test/web_layer_tree_view_impl_for_testing.h |
+++ b/content/test/web_layer_tree_view_impl_for_testing.h |
@@ -57,35 +57,35 @@ class WebLayerTreeViewImplForTesting |
virtual void registerViewportLayers( |
const blink::WebLayer* pageScaleLayerLayer, |
const blink::WebLayer* innerViewportScrollLayer, |
- const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; |
- virtual void clearViewportLayers() OVERRIDE; |
+ const blink::WebLayer* outerViewportScrollLayer) override; |
+ virtual void clearViewportLayers() override; |
virtual void registerSelection( |
const blink::WebSelectionBound& start, |
- const blink::WebSelectionBound& end) OVERRIDE; |
- virtual void clearSelection() OVERRIDE; |
+ const blink::WebSelectionBound& end) override; |
+ virtual void clearSelection() override; |
// cc::LayerTreeHostClient implementation. |
- virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} |
- virtual void DidBeginMainFrame() OVERRIDE {} |
- virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {} |
- virtual void Layout() OVERRIDE; |
+ virtual void WillBeginMainFrame(int frame_id) override {} |
+ virtual void DidBeginMainFrame() override {} |
+ virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override {} |
+ virtual void Layout() override; |
virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, |
const gfx::Vector2d& outer_delta, |
float page_scale, |
- float top_controls_delta) OVERRIDE; |
+ float top_controls_delta) override; |
virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
float page_scale, |
- float top_controls_delta) OVERRIDE; |
- virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; |
- virtual void DidInitializeOutputSurface() OVERRIDE {} |
- virtual void WillCommit() OVERRIDE {} |
- virtual void DidCommit() OVERRIDE {} |
- virtual void DidCommitAndDrawFrame() OVERRIDE {} |
- virtual void DidCompleteSwapBuffers() OVERRIDE {} |
+ float top_controls_delta) override; |
+ virtual void RequestNewOutputSurface(bool fallback) override; |
+ virtual void DidInitializeOutputSurface() override {} |
+ virtual void WillCommit() override {} |
+ virtual void DidCommit() override {} |
+ virtual void DidCommitAndDrawFrame() override {} |
+ virtual void DidCompleteSwapBuffers() override {} |
// cc::LayerTreeHostSingleThreadClient implementation. |
- virtual void DidPostSwapBuffers() OVERRIDE {} |
- virtual void DidAbortSwapBuffers() OVERRIDE {} |
+ virtual void DidPostSwapBuffers() override {} |
+ virtual void DidAbortSwapBuffers() override {} |
private: |
scoped_ptr<cc::LayerTreeHost> layer_tree_host_; |