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

Unified Diff: chrome/test/webdriver/automation.h

Issue 7634031: Let pyauto create an attached webdriver instance to manipulate web pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgot to re-add the previously added files Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/webdriver/automation.h
diff --git a/chrome/test/webdriver/automation.h b/chrome/test/webdriver/automation.h
index 8732489c7460ae7c56d81545bb6a539e10bf54ea..dcb6dba0494ce7bc78bc7e1ac3c5f8d76690dccd 100644
--- a/chrome/test/webdriver/automation.h
+++ b/chrome/test/webdriver/automation.h
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/command_line.h"
#include "base/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -17,8 +18,6 @@
#include "ui/base/keycodes/keyboard_codes.h"
class AutomationProxy;
-class CommandLine;
-class FilePath;
class ProxyLauncher;
struct WebKeyEvent;
@@ -42,19 +41,20 @@ class FramePath;
// by posting a task from NewRunnableMethod.
class Automation {
public:
+ struct BrowserOptions {
+ BrowserOptions();
+ ~BrowserOptions();
+
+ CommandLine command;
+ FilePath user_data_dir;
+ std::string channel_id;
+ };
+
Automation();
virtual ~Automation();
- // Creates a browser, using the specified |browser_exe| and |user_data_dir|.
- void InitWithBrowserPath(const FilePath& browser_exe,
- const FilePath& user_data_dir,
- const CommandLine& options,
- Error** error);
-
// Start the system's default Chrome binary.
- void Init(const CommandLine& options,
- const FilePath& user_data_dir,
- Error** error);
+ void Init(const BrowserOptions& options, Error** error);
// Terminates this session and disconnects its automation proxy. After
// invoking this method, the Automation can safely be deleted.

Powered by Google App Engine
This is Rietveld 408576698