| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_WEBKIT_TEST_CONTROLLER_H_ | 5 #ifndef CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ |
| 6 #define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ | 6 #define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <ostream> | 8 #include <ostream> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 WebKitTestResultPrinter* printer() { return printer_.get(); } | 124 WebKitTestResultPrinter* printer() { return printer_.get(); } |
| 125 void set_printer(WebKitTestResultPrinter* printer) { | 125 void set_printer(WebKitTestResultPrinter* printer) { |
| 126 printer_.reset(printer); | 126 printer_.reset(printer); |
| 127 } | 127 } |
| 128 | 128 |
| 129 // WebContentsObserver implementation. | 129 // WebContentsObserver implementation. |
| 130 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 130 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
| 131 virtual void PluginCrashed(const base::FilePath& plugin_path, | 131 virtual void PluginCrashed(const base::FilePath& plugin_path, |
| 132 base::ProcessId plugin_pid) OVERRIDE; | 132 base::ProcessId plugin_pid) OVERRIDE; |
| 133 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; | 133 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; |
| 134 virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE; | 134 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; |
| 135 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; | 135 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; |
| 136 | 136 |
| 137 // NotificationObserver implementation. | 137 // NotificationObserver implementation. |
| 138 virtual void Observe(int type, | 138 virtual void Observe(int type, |
| 139 const NotificationSource& source, | 139 const NotificationSource& source, |
| 140 const NotificationDetails& details) OVERRIDE; | 140 const NotificationDetails& details) OVERRIDE; |
| 141 | 141 |
| 142 // GpuDataManagerObserver implementation. | 142 // GpuDataManagerObserver implementation. |
| 143 virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) OVERRIDE; | 143 virtual void OnGpuProcessCrashed(base::TerminationStatus exit_code) OVERRIDE; |
| 144 | 144 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 // waiting on the UI thread while layout tests are being ran. | 209 // waiting on the UI thread while layout tests are being ran. |
| 210 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 210 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
| 211 #endif | 211 #endif |
| 212 | 212 |
| 213 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); | 213 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
| 214 }; | 214 }; |
| 215 | 215 |
| 216 } // namespace content | 216 } // namespace content |
| 217 | 217 |
| 218 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ | 218 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ |
| OLD | NEW |