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

Side by Side Diff: content/shell/renderer/test_runner/test_runner.h

Issue 629143003: Replace OVERRIDE and FINAL with override and final in content/shell/[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
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_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 WebTaskList* mutable_task_list() { return &task_list_; } 58 WebTaskList* mutable_task_list() { return &task_list_; }
59 59
60 void SetTestIsRunning(bool); 60 void SetTestIsRunning(bool);
61 bool TestIsRunning() const { return test_is_running_; } 61 bool TestIsRunning() const { return test_is_running_; }
62 62
63 bool UseMockTheme() const { return use_mock_theme_; } 63 bool UseMockTheme() const { return use_mock_theme_; }
64 64
65 void InvokeCallback(scoped_ptr<InvokeCallbackTask> callback); 65 void InvokeCallback(scoped_ptr<InvokeCallbackTask> callback);
66 66
67 // WebTestRunner implementation. 67 // WebTestRunner implementation.
68 virtual bool ShouldGeneratePixelResults() OVERRIDE; 68 virtual bool ShouldGeneratePixelResults() override;
69 virtual bool ShouldDumpAsAudio() const OVERRIDE; 69 virtual bool ShouldDumpAsAudio() const override;
70 virtual void GetAudioData( 70 virtual void GetAudioData(
71 std::vector<unsigned char>* buffer_view) const OVERRIDE; 71 std::vector<unsigned char>* buffer_view) const override;
72 virtual bool ShouldDumpBackForwardList() const OVERRIDE; 72 virtual bool ShouldDumpBackForwardList() const override;
73 virtual blink::WebPermissionClient* GetWebPermissions() const OVERRIDE; 73 virtual blink::WebPermissionClient* GetWebPermissions() const override;
74 74
75 // Methods used by WebTestProxyBase. 75 // Methods used by WebTestProxyBase.
76 bool shouldDumpSelectionRect() const; 76 bool shouldDumpSelectionRect() const;
77 bool isPrinting() const; 77 bool isPrinting() const;
78 bool shouldDumpAsText(); 78 bool shouldDumpAsText();
79 bool shouldDumpAsTextWithPixelResults(); 79 bool shouldDumpAsTextWithPixelResults();
80 bool shouldDumpAsCustomText() const; 80 bool shouldDumpAsCustomText() const;
81 std:: string customDumpText() const; 81 std:: string customDumpText() const;
82 bool shouldDumpAsMarkup(); 82 bool shouldDumpAsMarkup();
83 bool shouldDumpChildFrameScrollPositions() const; 83 bool shouldDumpChildFrameScrollPositions() const;
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 bool is_empty() { return queue_.empty(); } 157 bool is_empty() { return queue_.empty(); }
158 WebTaskList* mutable_task_list() { return &task_list_; } 158 WebTaskList* mutable_task_list() { return &task_list_; }
159 159
160 private: 160 private:
161 void ProcessWork(); 161 void ProcessWork();
162 162
163 class WorkQueueTask : public WebMethodTask<WorkQueue> { 163 class WorkQueueTask : public WebMethodTask<WorkQueue> {
164 public: 164 public:
165 WorkQueueTask(WorkQueue* object) : WebMethodTask<WorkQueue>(object) {} 165 WorkQueueTask(WorkQueue* object) : WebMethodTask<WorkQueue>(object) {}
166 166
167 virtual void RunIfValid() OVERRIDE; 167 virtual void RunIfValid() override;
168 }; 168 };
169 169
170 WebTaskList task_list_; 170 WebTaskList task_list_;
171 std::deque<WorkItem*> queue_; 171 std::deque<WorkItem*> queue_;
172 bool frozen_; 172 bool frozen_;
173 TestRunner* controller_; 173 TestRunner* controller_;
174 }; 174 };
175 175
176 /////////////////////////////////////////////////////////////////////////// 176 ///////////////////////////////////////////////////////////////////////////
177 // Methods dealing with the test logic 177 // Methods dealing with the test logic
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 bool use_mock_theme_; 776 bool use_mock_theme_;
777 777
778 base::WeakPtrFactory<TestRunner> weak_factory_; 778 base::WeakPtrFactory<TestRunner> weak_factory_;
779 779
780 DISALLOW_COPY_AND_ASSIGN(TestRunner); 780 DISALLOW_COPY_AND_ASSIGN(TestRunner);
781 }; 781 };
782 782
783 } // namespace content 783 } // namespace content
784 784
785 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_ 785 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_TEST_RUNNER_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/test_plugin.h ('k') | content/shell/renderer/test_runner/test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698