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

Side by Side Diff: chrome/test/webdriver/webdriver_automation.h

Issue 10828135: Allow popups, mouselock, and https media-stream content by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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 | « chrome/test/webdriver/test/test_paths.py ('k') | chrome/test/webdriver/webdriver_automation.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 CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ 5 #ifndef CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_
6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ 6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // the browser will be launched with an anonymous channel. 61 // the browser will be launched with an anonymous channel.
62 std::string channel_id; 62 std::string channel_id;
63 63
64 // True if the Chrome process should only be terminated if quit is called. 64 // True if the Chrome process should only be terminated if quit is called.
65 // If false, Chrome will also be terminated if this process is killed or 65 // If false, Chrome will also be terminated if this process is killed or
66 // shutdown. 66 // shutdown.
67 bool detach_process; 67 bool detach_process;
68 68
69 // True if the browser should ignore certificate related errors. 69 // True if the browser should ignore certificate related errors.
70 bool ignore_certificate_errors; 70 bool ignore_certificate_errors;
71
72 // True if the browser should disable popup blocking.
73 bool disable_popup_blocking;
74 }; 71 };
75 72
76 explicit Automation(const Logger& logger); 73 explicit Automation(const Logger& logger);
77 virtual ~Automation(); 74 virtual ~Automation();
78 75
79 // Start the system's default Chrome binary. 76 // Start the system's default Chrome binary.
80 void Init(const BrowserOptions& options, int* build_no, Error** error); 77 void Init(const BrowserOptions& options, int* build_no, Error** error);
81 78
82 // Terminates this session and disconnects its automation proxy. After 79 // Terminates this session and disconnects its automation proxy. After
83 // invoking this method, the Automation can safely be deleted. 80 // invoking this method, the Automation can safely be deleted.
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 scoped_ptr<ProxyLauncher> launcher_; 272 scoped_ptr<ProxyLauncher> launcher_;
276 int build_no_; 273 int build_no_;
277 scoped_ptr<base::DictionaryValue> geolocation_; 274 scoped_ptr<base::DictionaryValue> geolocation_;
278 275
279 DISALLOW_COPY_AND_ASSIGN(Automation); 276 DISALLOW_COPY_AND_ASSIGN(Automation);
280 }; 277 };
281 278
282 } // namespace webdriver 279 } // namespace webdriver
283 280
284 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_ 281 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_AUTOMATION_H_
OLDNEW
« no previous file with comments | « chrome/test/webdriver/test/test_paths.py ('k') | chrome/test/webdriver/webdriver_automation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698