Chromium Code Reviews| Index: chrome/installer/launcher_support/chrome_launcher_support.cc |
| diff --git a/chrome/installer/launcher_support/chrome_launcher_support.cc b/chrome/installer/launcher_support/chrome_launcher_support.cc |
| index c28bf9977fe403abb101b0da3718902fee2798b4..458b42b668d447c86bad5f7649508ec5cae3ee54 100644 |
| --- a/chrome/installer/launcher_support/chrome_launcher_support.cc |
| +++ b/chrome/installer/launcher_support/chrome_launcher_support.cc |
| @@ -34,6 +34,7 @@ const wchar_t kAppHostAppId[] = L"{FDA71E6F-AC4C-4a00-8B70-9958A68906BF}"; |
| // Copied from chrome_appid.cc. |
| const wchar_t kBinariesAppGuid[] = L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}"; |
| +const wchar_t kSxSBrowserAppGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}"; |
| // Copied from google_chrome_distribution.cc. |
| const wchar_t kBrowserAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; |
| @@ -42,6 +43,7 @@ const wchar_t kBrowserAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; |
| const wchar_t kChromeAppHostExe[] = L"app_host.exe"; |
| const char kChromeAppLauncher[] = "app-launcher"; |
| const wchar_t kChromeExe[] = L"chrome.exe"; |
| +const char kChromeSxS[] = "chrome-sxs"; |
| const wchar_t kUninstallArgumentsField[] = L"UninstallArguments"; |
| const wchar_t kUninstallStringField[] = L"UninstallString"; |
| @@ -150,6 +152,9 @@ void UninstallLegacyAppLauncher(InstallationLevel level) { |
| } |
| base::FilePath GetSetupExeForInstallationLevel(InstallationLevel level) { |
| + if (CommandLine::ForCurrentProcess()->HasSwitch(kChromeSxS)) |
|
grt (UTC plus 2)
2014/03/17 21:26:51
from what context do you expect to call this? do c
|
| + return GetSetupExeFromRegistry(level, kSxSBrowserAppGuid); |
| + |
| // Look in the registry for Chrome Binaries first. |
| base::FilePath setup_exe_path( |
| GetSetupExeFromRegistry(level, kBinariesAppGuid)); |