| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 void OverrideWebkitPrefs(WebPreferences* prefs); | 122 void OverrideWebkitPrefs(WebPreferences* prefs); |
| 123 void OpenURL(const GURL& url); | 123 void OpenURL(const GURL& url); |
| 124 void TestFinishedInSecondaryWindow(); | 124 void TestFinishedInSecondaryWindow(); |
| 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(); |
| 133 |
| 132 // WebContentsObserver implementation. | 134 // WebContentsObserver implementation. |
| 133 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 135 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
| 134 virtual void PluginCrashed(const base::FilePath& plugin_path, | 136 virtual void PluginCrashed(const base::FilePath& plugin_path, |
| 135 base::ProcessId plugin_pid) OVERRIDE; | 137 base::ProcessId plugin_pid) OVERRIDE; |
| 136 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; | 138 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; |
| 137 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; | 139 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; |
| 138 virtual void WebContentsDestroyed() OVERRIDE; | 140 virtual void WebContentsDestroyed() OVERRIDE; |
| 139 | 141 |
| 140 // NotificationObserver implementation. | 142 // NotificationObserver implementation. |
| 141 virtual void Observe(int type, | 143 virtual void Observe(int type, |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 // waiting on the UI thread while layout tests are being ran. | 218 // waiting on the UI thread while layout tests are being ran. |
| 217 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 219 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
| 218 #endif | 220 #endif |
| 219 | 221 |
| 220 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); | 222 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
| 221 }; | 223 }; |
| 222 | 224 |
| 223 } // namespace content | 225 } // namespace content |
| 224 | 226 |
| 225 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ | 227 #endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ |
| OLD | NEW |