| 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_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <ostream> | 10 #include <ostream> |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 | 159 |
| 160 void DevToolsProcessCrashed(); | 160 void DevToolsProcessCrashed(); |
| 161 | 161 |
| 162 // WebContentsObserver implementation. | 162 // WebContentsObserver implementation. |
| 163 bool OnMessageReceived(const IPC::Message& message) override; | 163 bool OnMessageReceived(const IPC::Message& message) override; |
| 164 bool OnMessageReceived(const IPC::Message& message, | 164 bool OnMessageReceived(const IPC::Message& message, |
| 165 RenderFrameHost* render_frame_host) override; | 165 RenderFrameHost* render_frame_host) override; |
| 166 void PluginCrashed(const base::FilePath& plugin_path, | 166 void PluginCrashed(const base::FilePath& plugin_path, |
| 167 base::ProcessId plugin_pid) override; | 167 base::ProcessId plugin_pid) override; |
| 168 void RenderFrameCreated(RenderFrameHost* render_frame_host) override; | 168 void RenderFrameCreated(RenderFrameHost* render_frame_host) override; |
| 169 void RenderFrameHostChanged(RenderFrameHost* old_host, | |
| 170 RenderFrameHost* new_host) override; | |
| 171 void WebContentsDestroyed() override; | 169 void WebContentsDestroyed() override; |
| 172 | 170 |
| 173 // RenderProcessHostObserver implementation. | 171 // RenderProcessHostObserver implementation. |
| 174 void RenderProcessHostDestroyed( | 172 void RenderProcessHostDestroyed( |
| 175 RenderProcessHost* render_process_host) override; | 173 RenderProcessHost* render_process_host) override; |
| 176 void RenderProcessExited(RenderProcessHost* render_process_host, | 174 void RenderProcessExited(RenderProcessHost* render_process_host, |
| 177 base::TerminationStatus status, | 175 base::TerminationStatus status, |
| 178 int exit_code) override; | 176 int exit_code) override; |
| 179 | 177 |
| 180 // NotificationObserver implementation. | 178 // NotificationObserver implementation. |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 // waiting on the UI thread while layout tests are being ran. | 283 // waiting on the UI thread while layout tests are being ran. |
| 286 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; | 284 ScopedAllowWaitForAndroidLayoutTests reduced_restrictions_; |
| 287 #endif | 285 #endif |
| 288 | 286 |
| 289 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); | 287 DISALLOW_COPY_AND_ASSIGN(BlinkTestController); |
| 290 }; | 288 }; |
| 291 | 289 |
| 292 } // namespace content | 290 } // namespace content |
| 293 | 291 |
| 294 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ | 292 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_BLINK_TEST_CONTROLLER_H_ |
| OLD | NEW |