Chromium Code Reviews| Index: chrome/installer/util/install_util.cc |
| diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc |
| index c8c037df823364a081b3ebac240cb974244d3e27..4205516dceef0edccae8954d5f2e0273ee228a41 100644 |
| --- a/chrome/installer/util/install_util.cc |
| +++ b/chrome/installer/util/install_util.cc |
| @@ -58,6 +58,14 @@ const wchar_t kStageUpdatingChannels[] = L"updating_channels"; |
| const wchar_t kStageCreatingVisualManifest[] = L"creating_visual_manifest"; |
| const wchar_t kStageDeferringToHigherVersion[] = L"deferring_to_higher_version"; |
| +#if defined(GOOGLE_CHROME_BUILD) |
| +const wchar_t kChromeUserModelId[] = L"Chrome"; |
| +const wchar_t kChromeSxSUserModelId[] = L"ChromeSXS"; |
| +#else |
| +const wchar_t kChromiumUserModelId[] = L"Chromium"; |
| +#endif |
| + |
| + |
| const wchar_t* const kStages[] = { |
| NULL, |
| kStagePreconditions, |
| @@ -121,6 +129,15 @@ HWND CreateUACForegroundWindow() { |
| } // namespace |
| +string16 InstallUtil::GetAppUserModelId() { |
|
gab
2013/09/03 21:05:19
This is GetBaseAppId() from BrowserDistribution.
zturner
2013/09/05 01:35:29
Done.
|
| +#if defined(GOOGLE_CHROME_BUILD) |
| + return string16(IsChromeSxSProcess() ? |
| + kChromeSxSUserModelId : kChromeUserModelId); |
| +#else |
| + return kChromiumUserModelId; |
| +#endif |
| +} |
| + |
| string16 InstallUtil::GetActiveSetupPath(BrowserDistribution* dist) { |
| static const wchar_t kInstalledComponentsPath[] = |
| L"Software\\Microsoft\\Active Setup\\Installed Components\\"; |