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

Unified Diff: tools/testing/dart/browser_controller.dart

Issue 23625008: Add support for chrome on windows to the new browser controller (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/browser_controller.dart
===================================================================
--- tools/testing/dart/browser_controller.dart (revision 27236)
+++ tools/testing/dart/browser_controller.dart (working copy)
@@ -317,16 +317,23 @@
class Chrome extends Browser {
- /**
- * The binary used to run chrome - changing this can be nececcary for
- * testing or using non standard chrome installation.
- */
- static const String binary = "google-chrome";
+ static String _binary = _getBinary();
+ // This is extracted to a function since we may need to support several
+ // locations.
+ static String _getWindowsBinary() {
+ return "C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe";
+ }
+
+ static String _getBinary() {
+ if (Platform.isWindows) return _getWindowsBinary();
+ if (Platform.isLinux) return 'google-chrome';
kustermann 2013/09/06 09:24:55 Please add the path for mac as well.
ricow1 2013/09/06 09:40:21 Done.
+ }
+
Future<bool> start(String url) {
_logEvent("Starting chrome browser on: $url");
// Get the version and log that.
- return Process.run(binary, ["--version"]).then((var versionResult) {
+ return Process.run(_binary, ["--version"]).then((var versionResult) {
if (versionResult.exitCode != 0) {
_logEvent("Failed to chrome get version");
_logEvent("Make sure $binary is a valid program for running chrome");
@@ -340,7 +347,7 @@
var args = ["--user-data-dir=${userDir.path}", url,
"--disable-extensions", "--disable-popup-blocking",
"--bwsi", "--no-first-run"];
- return startBrowser(binary, args);
+ return startBrowser(_binary, args);
});
}).catchError((e) {
@@ -484,7 +491,6 @@
if (Platform.isLinux) return 'firefox';
}
-
Future<bool> start(String url) {
_logEvent("Starting firefox browser on: $url");
// Get the version and log that.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698