| OLD | NEW |
| 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 // WebContentsObserver implementation. | 132 // WebContentsObserver implementation. |
| 133 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 133 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
| 134 virtual void PluginCrashed(const base::FilePath& plugin_path, | 134 virtual void PluginCrashed(const base::FilePath& plugin_path, |
| 135 base::ProcessId plugin_pid) OVERRIDE; | 135 base::ProcessId plugin_pid) OVERRIDE; |
| 136 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; | 136 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; |
| 137 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; | 137 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; |
| 138 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; | 138 virtual void WebContentsDestroyed() OVERRIDE; |
| 139 | 139 |
| 140 // NotificationObserver implementation. | 140 // NotificationObserver implementation. |
| 141 virtual void Observe(int type, | 141 virtual void Observe(int type, |
| 142 const NotificationSource& source, | 142 const NotificationSource& source, |
| 143 const NotificationDetails& details) OVERRIDE; | 143 const NotificationDetails& details) OVERRIDE; |
| 144 | 144 |
| 145 // GpuDataManagerObserver implementation. | 145 // GpuDataManagerObserver implementation. |
| 146 virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) OVERRIDE; | 146 virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) OVERRIDE; |
| 147 | 147 |
| 148 private: | 148 private: |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 // waiting on the UI thread while layout tests are being ran. | 216 // waiting on the UI thread while layout tests are being ran. |
| 217 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 217 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
| 218 #endif | 218 #endif |
| 219 | 219 |
| 220 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); | 220 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
| 221 }; | 221 }; |
| 222 | 222 |
| 223 } // namespace content | 223 } // namespace content |
| 224 | 224 |
| 225 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ | 225 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ |
| OLD | NEW |