| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 library browser; | 4 library browser; |
| 5 | 5 |
| 6 import "dart:async"; | 6 import "dart:async"; |
| 7 import "dart:convert" show LineSplitter, UTF8, JSON; | 7 import "dart:convert" show LineSplitter, UTF8, JSON; |
| 8 import "dart:core"; | 8 import "dart:core"; |
| 9 import "dart:io"; | 9 import "dart:io"; |
| 10 | 10 |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 | 141 |
| 142 /** | 142 /** |
| 143 * Start the browser using the supplied argument. | 143 * Start the browser using the supplied argument. |
| 144 * This sets up the error handling and usage logging. | 144 * This sets up the error handling and usage logging. |
| 145 */ | 145 */ |
| 146 Future<bool> startBrowser(String command, | 146 Future<bool> startBrowser(String command, |
| 147 List<String> arguments, | 147 List<String> arguments, |
| 148 {Map<String,String> environment}) { | 148 {Map<String,String> environment}) { |
| 149 return Process.start(command, arguments, environment: environment) | 149 return Process.start(command, arguments, environment: environment) |
| 150 .then((startedProcess) { | 150 .then((startedProcess) { |
| 151 _logEvent("Started browser using $command ${arguments.join(' ')}"); |
| 151 process = startedProcess; | 152 process = startedProcess; |
| 152 // Used to notify when exiting, and as a return value on calls to | 153 // Used to notify when exiting, and as a return value on calls to |
| 153 // close(). | 154 // close(). |
| 154 var doneCompleter = new Completer(); | 155 var doneCompleter = new Completer(); |
| 155 done = doneCompleter.future; | 156 done = doneCompleter.future; |
| 156 | 157 |
| 157 Completer stdoutDone = new Completer(); | 158 Completer stdoutDone = new Completer(); |
| 158 Completer stderrDone = new Completer(); | 159 Completer stderrDone = new Completer(); |
| 159 | 160 |
| 160 bool stdoutIsDone = false; | 161 bool stdoutIsDone = false; |
| (...skipping 1624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1785 </div> | 1786 </div> |
| 1786 <div id="embedded_iframe_div" class="test box"> | 1787 <div id="embedded_iframe_div" class="test box"> |
| 1787 <iframe style="width:100%;height:100%;" id="embedded_iframe"></iframe> | 1788 <iframe style="width:100%;height:100%;" id="embedded_iframe"></iframe> |
| 1788 </div> | 1789 </div> |
| 1789 </body> | 1790 </body> |
| 1790 </html> | 1791 </html> |
| 1791 """; | 1792 """; |
| 1792 return driverContent; | 1793 return driverContent; |
| 1793 } | 1794 } |
| 1794 } | 1795 } |
| OLD | NEW |