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

Side by Side Diff: chrome/test/chromedriver/capabilities.h

Issue 19773012: [chromedriver] Accept loadAsync as a non-op chromeOption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittest. Created 7 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 | « no previous file | chrome/test/chromedriver/capabilities.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_
6 #define CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_ 6 #define CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 14
15 namespace base { 15 namespace base {
16 class DictionaryValue; 16 class DictionaryValue;
17 } 17 }
18 18
19 class Log;
19 class Status; 20 class Status;
20 21
21 struct Capabilities { 22 struct Capabilities {
22 Capabilities(); 23 Capabilities();
23 ~Capabilities(); 24 ~Capabilities();
24 25
25 // Return true if android package is specified. 26 // Return true if android package is specified.
26 bool IsAndroid() const; 27 bool IsAndroid() const;
27 28
28 Status Parse(const base::DictionaryValue& desired_caps); 29 Status Parse(const base::DictionaryValue& desired_caps, Log* log);
29 30
30 // Whether the lifetime of the started Chrome browser process should be 31 // Whether the lifetime of the started Chrome browser process should be
31 // bound to ChromeDriver's process. If true, Chrome will not quit if 32 // bound to ChromeDriver's process. If true, Chrome will not quit if
32 // ChromeDriver dies. 33 // ChromeDriver dies.
33 bool detach; 34 bool detach;
34 35
35 std::string android_package; 36 std::string android_package;
36 std::string android_activity; 37 std::string android_activity;
37 std::string android_process; 38 std::string android_process;
38 std::string android_device_serial; 39 std::string android_device_serial;
39 std::string android_args; 40 std::string android_args;
40 41
41 std::string log_path; 42 std::string log_path;
42 CommandLine command; 43 CommandLine command;
43 scoped_ptr<base::DictionaryValue> prefs; 44 scoped_ptr<base::DictionaryValue> prefs;
44 scoped_ptr<base::DictionaryValue> local_state; 45 scoped_ptr<base::DictionaryValue> local_state;
45 std::vector<std::string> extensions; 46 std::vector<std::string> extensions;
46 scoped_ptr<base::DictionaryValue> logging_prefs; 47 scoped_ptr<base::DictionaryValue> logging_prefs;
47 }; 48 };
48 49
49 #endif // CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_ 50 #endif // CHROME_TEST_CHROMEDRIVER_CAPABILITIES_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/test/chromedriver/capabilities.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698