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

Side by Side Diff: content/shell/browser/webkit_test_controller.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 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_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 5 #ifndef CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
6 #define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 6 #define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
7 7
8 #include <ostream> 8 #include <ostream>
9 #include <string> 9 #include <string>
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 bool IsMainWindow(WebContents* web_contents) const; 125 bool IsMainWindow(WebContents* web_contents) const;
126 126
127 WebKitTestResultPrinter* printer() { return printer_.get(); } 127 WebKitTestResultPrinter* printer() { return printer_.get(); }
128 void set_printer(WebKitTestResultPrinter* printer) { 128 void set_printer(WebKitTestResultPrinter* printer) {
129 printer_.reset(printer); 129 printer_.reset(printer);
130 } 130 }
131 131
132 void DevToolsProcessCrashed(); 132 void DevToolsProcessCrashed();
133 133
134 // WebContentsObserver implementation. 134 // WebContentsObserver implementation.
135 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 135 virtual bool OnMessageReceived(const IPC::Message& message) override;
136 virtual void PluginCrashed(const base::FilePath& plugin_path, 136 virtual void PluginCrashed(const base::FilePath& plugin_path,
137 base::ProcessId plugin_pid) OVERRIDE; 137 base::ProcessId plugin_pid) override;
138 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; 138 virtual void RenderViewCreated(RenderViewHost* render_view_host) override;
139 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; 139 virtual void RenderProcessGone(base::TerminationStatus status) override;
140 virtual void WebContentsDestroyed() OVERRIDE; 140 virtual void WebContentsDestroyed() override;
141 141
142 // NotificationObserver implementation. 142 // NotificationObserver implementation.
143 virtual void Observe(int type, 143 virtual void Observe(int type,
144 const NotificationSource& source, 144 const NotificationSource& source,
145 const NotificationDetails& details) OVERRIDE; 145 const NotificationDetails& details) override;
146 146
147 // GpuDataManagerObserver implementation. 147 // GpuDataManagerObserver implementation.
148 virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) OVERRIDE; 148 virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) override;
149 149
150 private: 150 private:
151 enum TestPhase { 151 enum TestPhase {
152 BETWEEN_TESTS, 152 BETWEEN_TESTS,
153 DURING_TEST, 153 DURING_TEST,
154 CLEAN_UP 154 CLEAN_UP
155 }; 155 };
156 156
157 static WebKitTestController* instance_; 157 static WebKitTestController* instance_;
158 158
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // waiting on the UI thread while layout tests are being ran. 219 // waiting on the UI thread while layout tests are being ran.
220 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; 220 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_;
221 #endif 221 #endif
222 222
223 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); 223 DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
224 }; 224 };
225 225
226 } // namespace content 226 } // namespace content
227 227
228 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ 228 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « content/shell/browser/shell_web_contents_view_delegate.h ('k') | content/shell/common/shell_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698