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

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py

Issue 167733005: [telemetry] Fix browser finding on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
index 706913206f4691d70e027682aee9cd35f5808593..90fbe4a77cf374cedcabaaa3ba404826adc066c1 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py
@@ -205,27 +205,27 @@ def FindAllAvailableBrowsers(finder_options):
os.getenv('PROGRAMFILES'),
os.getenv('LOCALAPPDATA')]
- def AddIfFoundWin(browser_name, app_path):
- browser_directory = os.path.join(path, app_path)
+ def AddIfFoundWin(browser_name, search_path, app_path):
+ browser_directory = os.path.join(search_path, app_path)
for chromium_app_name in chromium_app_names:
app = os.path.join(browser_directory, chromium_app_name)
if IsExecutable(app):
browsers.append(PossibleDesktopBrowser(browser_name, finder_options,
app, None, False,
browser_directory))
- return True
+ return True
return False
for path in win_search_paths:
if not path:
continue
- if AddIfFoundWin('canary', canary_path):
+ if AddIfFoundWin('canary', path, canary_path):
break
for path in win_search_paths:
if not path:
continue
- if AddIfFoundWin('system', system_path):
+ if AddIfFoundWin('system', path, system_path):
break
if len(browsers) and not has_display:
« 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