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

Unified Diff: chrome/app_installer/win/app_installer_main.cc

Issue 685103004: Refactor chrome_launcher_support::GetAnyChromePath. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix app_installer compile. Created 5 years, 11 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 | chrome/app_installer/win/app_installer_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app_installer/win/app_installer_main.cc
diff --git a/chrome/app_installer/win/app_installer_main.cc b/chrome/app_installer/win/app_installer_main.cc
index 55bc04b1d52430d3c142fe7f96b3a853823f5fd5..3266f9dde35bc96ab67404f92a738c4ace1f7b66 100644
--- a/chrome/app_installer/win/app_installer_main.cc
+++ b/chrome/app_installer/win/app_installer_main.cc
@@ -20,6 +20,7 @@
#include "chrome/app_installer/win/app_installer_util.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
+#include "chrome/installer/launcher_support/chrome_launcher_support.h"
#include "chrome/installer/util/util_constants.h"
#include "content/public/common/user_agent.h"
@@ -121,14 +122,15 @@ int WINAPI wWinMain(HINSTANCE instance,
return COULD_NOT_PARSE_INLINE_INSTALL_DATA;
}
- base::FilePath chrome_path = GetChromeExePath(is_canary);
+ base::FilePath chrome_path =
+ chrome_launcher_support::GetAnyChromePath(is_canary);
// If none found, show EULA, download, and install Chrome.
if (chrome_path.empty()) {
ExitCode get_chrome_result = GetChrome(is_canary, inline_install_json);
if (get_chrome_result != SUCCESS)
return get_chrome_result;
- chrome_path = GetChromeExePath(is_canary);
+ chrome_path = chrome_launcher_support::GetAnyChromePath(is_canary);
if (chrome_path.empty())
return COULD_NOT_FIND_CHROME;
}
« no previous file with comments | « no previous file | chrome/app_installer/win/app_installer_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698