Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 import os as os | 4 import os as os |
| 5 import subprocess as subprocess | 5 import subprocess as subprocess |
| 6 import shutil | 6 import shutil |
| 7 import tempfile | 7 import tempfile |
| 8 | 8 |
| 9 from telemetry import browser_backend | 9 from telemetry import browser_backend |
| 10 from telemetry import util | 10 from telemetry import util |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 46 raise | 46 raise |
| 47 | 47 |
| 48 def GetBrowserStartupArgs(self): | 48 def GetBrowserStartupArgs(self): |
| 49 args = super(DesktopBrowserBackend, self).GetBrowserStartupArgs() | 49 args = super(DesktopBrowserBackend, self).GetBrowserStartupArgs() |
| 50 args.append('--remote-debugging-port=%i' % self._port) | 50 args.append('--remote-debugging-port=%i' % self._port) |
| 51 args.append('--window-size=1280,1024') | 51 args.append('--window-size=1280,1024') |
| 52 args.append('--enable-benchmarking') | 52 args.append('--enable-benchmarking') |
| 53 if not self.options.dont_override_profile: | 53 if not self.options.dont_override_profile: |
| 54 self._tmpdir = tempfile.mkdtemp() | 54 self._tmpdir = tempfile.mkdtemp() |
| 55 args.append('--user-data-dir=%s' % self._tmpdir) | 55 args.append('--user-data-dir=%s' % self._tmpdir) |
| 56 extensions = '' | |
| 57 component_extensions = '' | |
| 58 for extension in self.options.extensions_to_load: | |
| 59 if extension.is_component: | |
| 60 if len(component_extensions): | |
| 61 component_extensions += ',' | |
|
nduca
2012/12/07 19:23:47
how about compoent_extensions and extensions being
zel
2012/12/12 21:03:42
done, made it even more pythony
| |
| 62 component_extensions += extension.path | |
| 63 else: | |
| 64 if len(extensions): | |
| 65 extensions += ',' | |
| 66 extensions += extension.path | |
| 67 if len(extensions) > 0: | |
| 68 args.append('--load-extension=%s' % extensions) | |
| 69 if len(component_extensions) > 0: | |
| 70 args.append('--load-component-extension=%s' % component_extensions) | |
| 71 | |
| 56 return args | 72 return args |
| 57 | 73 |
| 58 def IsBrowserRunning(self): | 74 def IsBrowserRunning(self): |
| 59 return self._proc.poll() == None | 75 return self._proc.poll() == None |
| 60 | 76 |
| 61 def __del__(self): | 77 def __del__(self): |
| 62 self.Close() | 78 self.Close() |
| 63 | 79 |
| 64 def Close(self): | 80 def Close(self): |
| 65 if self._proc: | 81 if self._proc: |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 def __init__(self, *port_pairs): | 118 def __init__(self, *port_pairs): |
| 103 self._host_port = port_pairs[0][0] | 119 self._host_port = port_pairs[0][0] |
| 104 | 120 |
| 105 @property | 121 @property |
| 106 def url(self): | 122 def url(self): |
| 107 assert self._host_port | 123 assert self._host_port |
| 108 return 'http://localhost:%i' % self._host_port | 124 return 'http://localhost:%i' % self._host_port |
| 109 | 125 |
| 110 def Close(self): | 126 def Close(self): |
| 111 self._host_port = None | 127 self._host_port = None |
| OLD | NEW |