| Index: chrome/app_shim/win/app_shim_main.cc
|
| diff --git a/chrome/app_shim/win/app_shim_main.cc b/chrome/app_shim/win/app_shim_main.cc
|
| index 60a62aca9fc3401fb212b043e9586e6cc956c4de..a49d9a7f9d12f8856d663d27ac348ce44719b141 100644
|
| --- a/chrome/app_shim/win/app_shim_main.cc
|
| +++ b/chrome/app_shim/win/app_shim_main.cc
|
| @@ -22,11 +22,6 @@ const int kLaunchFailure = 2;
|
| // Command-line switches.
|
| const char kChromeSxS[] = "chrome-sxs";
|
|
|
| -base::FilePath GetChromeExePath(bool is_canary) {
|
| - return is_canary ? chrome_launcher_support::GetAnyChromeSxSPath()
|
| - : chrome_launcher_support::GetAnyChromePath();
|
| -}
|
| -
|
| } // namespace
|
|
|
| // This program runs chrome.exe, passing its arguments on to the Chrome binary.
|
| @@ -58,7 +53,8 @@ int WINAPI wWinMain(HINSTANCE instance,
|
| // --chrome-sxs on the command line means we should run the canary binary.
|
| bool is_canary =
|
| base::CommandLine::ForCurrentProcess()->HasSwitch(kChromeSxS);
|
| - base::FilePath chrome_path = GetChromeExePath(is_canary);
|
| + base::FilePath chrome_path =
|
| + chrome_launcher_support::GetAnyChromePath(is_canary);
|
| if (chrome_path.empty()) {
|
| LOG(ERROR) << "Could not find chrome.exe path in the registry.";
|
| return kNoProgram;
|
|
|