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

Side by Side Diff: content/test/web_layer_tree_view_impl_for_testing.h

Issue 630813002: Replace OVERRIDE and FINAL with override and final in content/test/[a-s]* (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/test/web_gesture_curve_mock.h ('k') | content/test/webrtc_content_browsertest_base.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_ 5 #ifndef CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
6 #define CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_ 6 #define CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/trees/layer_tree_host_client.h" 9 #include "cc/trees/layer_tree_host_client.h"
10 #include "cc/trees/layer_tree_host_single_thread_client.h" 10 #include "cc/trees/layer_tree_host_single_thread_client.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 float new_page_scale, 50 float new_page_scale,
51 double duration_sec); 51 double duration_sec);
52 virtual void setNeedsAnimate(); 52 virtual void setNeedsAnimate();
53 virtual bool commitRequested() const; 53 virtual bool commitRequested() const;
54 virtual void didStopFlinging(); 54 virtual void didStopFlinging();
55 virtual void finishAllRendering(); 55 virtual void finishAllRendering();
56 virtual void setDeferCommits(bool defer_commits); 56 virtual void setDeferCommits(bool defer_commits);
57 virtual void registerViewportLayers( 57 virtual void registerViewportLayers(
58 const blink::WebLayer* pageScaleLayerLayer, 58 const blink::WebLayer* pageScaleLayerLayer,
59 const blink::WebLayer* innerViewportScrollLayer, 59 const blink::WebLayer* innerViewportScrollLayer,
60 const blink::WebLayer* outerViewportScrollLayer) OVERRIDE; 60 const blink::WebLayer* outerViewportScrollLayer) override;
61 virtual void clearViewportLayers() OVERRIDE; 61 virtual void clearViewportLayers() override;
62 virtual void registerSelection( 62 virtual void registerSelection(
63 const blink::WebSelectionBound& start, 63 const blink::WebSelectionBound& start,
64 const blink::WebSelectionBound& end) OVERRIDE; 64 const blink::WebSelectionBound& end) override;
65 virtual void clearSelection() OVERRIDE; 65 virtual void clearSelection() override;
66 66
67 // cc::LayerTreeHostClient implementation. 67 // cc::LayerTreeHostClient implementation.
68 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} 68 virtual void WillBeginMainFrame(int frame_id) override {}
69 virtual void DidBeginMainFrame() OVERRIDE {} 69 virtual void DidBeginMainFrame() override {}
70 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {} 70 virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
71 virtual void Layout() OVERRIDE; 71 virtual void Layout() override;
72 virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, 72 virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
73 const gfx::Vector2d& outer_delta, 73 const gfx::Vector2d& outer_delta,
74 float page_scale, 74 float page_scale,
75 float top_controls_delta) OVERRIDE; 75 float top_controls_delta) override;
76 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, 76 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
77 float page_scale, 77 float page_scale,
78 float top_controls_delta) OVERRIDE; 78 float top_controls_delta) override;
79 virtual void RequestNewOutputSurface(bool fallback) OVERRIDE; 79 virtual void RequestNewOutputSurface(bool fallback) override;
80 virtual void DidInitializeOutputSurface() OVERRIDE {} 80 virtual void DidInitializeOutputSurface() override {}
81 virtual void WillCommit() OVERRIDE {} 81 virtual void WillCommit() override {}
82 virtual void DidCommit() OVERRIDE {} 82 virtual void DidCommit() override {}
83 virtual void DidCommitAndDrawFrame() OVERRIDE {} 83 virtual void DidCommitAndDrawFrame() override {}
84 virtual void DidCompleteSwapBuffers() OVERRIDE {} 84 virtual void DidCompleteSwapBuffers() override {}
85 85
86 // cc::LayerTreeHostSingleThreadClient implementation. 86 // cc::LayerTreeHostSingleThreadClient implementation.
87 virtual void DidPostSwapBuffers() OVERRIDE {} 87 virtual void DidPostSwapBuffers() override {}
88 virtual void DidAbortSwapBuffers() OVERRIDE {} 88 virtual void DidAbortSwapBuffers() override {}
89 89
90 private: 90 private:
91 scoped_ptr<cc::LayerTreeHost> layer_tree_host_; 91 scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
92 92
93 DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImplForTesting); 93 DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImplForTesting);
94 }; 94 };
95 95
96 } // namespace content 96 } // namespace content
97 97
98 #endif // CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_ 98 #endif // CONTENT_TEST_WEB_LAYER_TREE_VIEW_IMPL_FOR_TESTING_H_
OLDNEW
« no previous file with comments | « content/test/web_gesture_curve_mock.h ('k') | content/test/webrtc_content_browsertest_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698