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 9e9ba92604d6bde5c4d5be35b0b479d14ba85fc0..bf2683b65f884d4d925f2e5d14cf3dfd85c5b91b 100644 |
| --- a/chrome/installer/launcher_support/chrome_launcher_support.cc |
| +++ b/chrome/installer/launcher_support/chrome_launcher_support.cc |
| @@ -25,6 +25,9 @@ const wchar_t kBinariesAppGuid[] = L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}"; |
| // Copied from google_chrome_distribution.cc. |
| const wchar_t kBrowserAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; |
| +// Copied frome google_chrome_sxs_distribution.cc. |
| +const wchar_t kSxSBrowserAppGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}"; |
| + |
| // Copied from util_constants.cc. |
| const wchar_t kChromeExe[] = L"chrome.exe"; |
| const wchar_t kUninstallStringField[] = L"UninstallString"; |
| @@ -106,6 +109,11 @@ base::FilePath GetChromePathForInstallationLevel(InstallationLevel level) { |
| GetSetupExeForInstallationLevel(level), kChromeExe); |
| } |
| +base::FilePath GetChromeSxSPathForInstallationLevel(InstallationLevel level) { |
|
grt (UTC plus 2)
2014/07/30 15:05:37
please move this out of the header file and into t
jackhou1
2014/07/31 03:24:56
Done.
|
| + return FindExeRelativeToSetupExe( |
| + GetSetupExeFromRegistry(level, kSxSBrowserAppGuid), kChromeExe); |
| +} |
| + |
| base::FilePath GetAnyChromePath() { |
| base::FilePath chrome_path; |
| if (chrome_path.empty()) |
| @@ -115,4 +123,12 @@ base::FilePath GetAnyChromePath() { |
| return chrome_path; |
| } |
| +base::FilePath GetAnyChromeSxSPath() { |
| + base::FilePath path = |
| + GetChromeSxSPathForInstallationLevel(USER_LEVEL_INSTALLATION); |
| + if (path.empty()) |
| + path = GetChromeSxSPathForInstallationLevel(SYSTEM_LEVEL_INSTALLATION); |
| + return path; |
| +} |
| + |
| } // namespace chrome_launcher_support |