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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 } | 89 } |
90 bool should_stay_on_page_after_handling_before_unload() const { | 90 bool should_stay_on_page_after_handling_before_unload() const { |
91 return should_stay_on_page_after_handling_before_unload_; | 91 return should_stay_on_page_after_handling_before_unload_; |
92 } | 92 } |
93 | 93 |
94 // This method can be invoked on any thread. | 94 // This method can be invoked on any thread. |
95 bool CanOpenWindows() const; | 95 bool CanOpenWindows() const; |
96 | 96 |
97 // WebContentsObserver implementation. | 97 // WebContentsObserver implementation. |
98 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 98 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
99 virtual void PluginCrashed(const FilePath& plugin_path) OVERRIDE; | 99 virtual void PluginCrashed(const FilePath& plugin_path, |
| 100 base::ProcessId plugin_pid) OVERRIDE; |
100 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; | 101 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; |
101 virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE; | 102 virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE; |
102 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; | 103 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; |
103 | 104 |
104 private: | 105 private: |
105 static WebKitTestController* instance_; | 106 static WebKitTestController* instance_; |
106 | 107 |
107 void CaptureDump(); | 108 void CaptureDump(); |
108 void TimeoutHandler(); | 109 void TimeoutHandler(); |
109 | 110 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 // Access to the following variables needs to be guarded by |lock_|. | 157 // Access to the following variables needs to be guarded by |lock_|. |
157 mutable base::Lock lock_; | 158 mutable base::Lock lock_; |
158 bool can_open_windows_; | 159 bool can_open_windows_; |
159 | 160 |
160 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); | 161 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); |
161 }; | 162 }; |
162 | 163 |
163 } // namespace content | 164 } // namespace content |
164 | 165 |
165 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ | 166 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ |
OLD | NEW |