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

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: Created 6 years, 2 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
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 0a5ce8fbab08100be0c2d353bfe9cf882d0dc8de..146421c42b50950576e6bec530779d4cde683e00 100644
--- a/chrome/app_installer/win/app_installer_main.cc
+++ b/chrome/app_installer/win/app_installer_main.cc
@@ -186,11 +186,6 @@ bool IsValidAppId(const std::string& app_id) {
return true;
}
-base::FilePath GetChromeExePath(bool is_canary) {
- return is_canary ? chrome_launcher_support::GetAnyChromeSxSPath()
- : chrome_launcher_support::GetAnyChromePath();
-}
-
ExitCode GetChrome(bool is_canary) {
// Show UI to install Chrome. The UI returns a download URL.
base::string16 download_url =
@@ -277,14 +272,15 @@ int WINAPI wWinMain(HINSTANCE instance,
if (!IsValidAppId(app_id))
return INVALID_APP_ID;
- 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);
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;
}

Powered by Google App Engine
This is Rietveld 408576698