Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: content/shell/webkit_test_controller.h

Issue 16074003: [content shell] don't open new windows after printing the test results (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/shell/webkit_test_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 int current_pid_; 153 int current_pid_;
154 154
155 // True if we should set the test configuration to the next RenderViewHost 155 // True if we should set the test configuration to the next RenderViewHost
156 // created. 156 // created.
157 bool send_configuration_to_next_host_; 157 bool send_configuration_to_next_host_;
158 158
159 // True if we are currently running a layout test, and false during the setup 159 // True if we are currently running a layout test, and false during the setup
160 // phase between two layout tests. 160 // phase between two layout tests.
161 bool is_running_test_; 161 bool is_running_test_;
162 162
163 // True if we already printed results and are in the cleaning up phase of a
164 // test.
165 bool is_cleaning_up_;
marja 2013/05/28 11:16:35 Would it make sense to have a "test phase" enum in
166
163 // True if the currently running test is a compositing test. 167 // True if the currently running test is a compositing test.
164 bool is_compositing_test_; 168 bool is_compositing_test_;
165 169
166 // Per test config. 170 // Per test config.
167 bool enable_pixel_dumping_; 171 bool enable_pixel_dumping_;
168 std::string expected_pixel_hash_; 172 std::string expected_pixel_hash_;
169 gfx::Size initial_size_; 173 gfx::Size initial_size_;
170 GURL test_url_; 174 GURL test_url_;
171 175
172 // True if the WebPreferences of newly created RenderViewHost should be 176 // True if the WebPreferences of newly created RenderViewHost should be
173 // overridden with prefs_. 177 // overridden with prefs_.
174 bool should_override_prefs_; 178 bool should_override_prefs_;
175 WebPreferences prefs_; 179 WebPreferences prefs_;
176 180
177 base::CancelableClosure watchdog_; 181 base::CancelableClosure watchdog_;
178 182
179 NotificationRegistrar registrar_; 183 NotificationRegistrar registrar_;
180 184
181 DISALLOW_COPY_AND_ASSIGN(WebKitTestController); 185 DISALLOW_COPY_AND_ASSIGN(WebKitTestController);
182 }; 186 };
183 187
184 } // namespace content 188 } // namespace content
185 189
186 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ 190 #endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | content/shell/webkit_test_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698