diff options
| author | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 06:54:27 +0000 |
|---|---|---|
| committer | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-13 06:54:27 +0000 |
| commit | 67a8e72bd6e39955c9769f766e3b9b7f2ae846a0 (patch) | |
| tree | 8edac361a73331502a2c3d29ca2adfa34e0173db /win8/metro_driver/toast_notification_handler.cc | |
| parent | 978a2ae248b9c2bc74369e685628542457660198 (diff) | |
| download | chromium_src-67a8e72bd6e39955c9769f766e3b9b7f2ae846a0.zip chromium_src-67a8e72bd6e39955c9769f766e3b9b7f2ae846a0.tar.gz chromium_src-67a8e72bd6e39955c9769f766e3b9b7f2ae846a0.tar.bz2 | |
Give SxS distribution its own registration GUIDs.
See the linked bug for more information about this change.
BUG=273248
gab: chrome/installer/*
ananta, cpu: win8/
Review URL: https://chromiumcodereview.appspot.com/23258005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/toast_notification_handler.cc')
| -rw-r--r-- | win8/metro_driver/toast_notification_handler.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/win8/metro_driver/toast_notification_handler.cc b/win8/metro_driver/toast_notification_handler.cc index fb85456..ab014d4 100644 --- a/win8/metro_driver/toast_notification_handler.cc +++ b/win8/metro_driver/toast_notification_handler.cc @@ -11,9 +11,10 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -// TODO(ananta) -// Refactor the chrome_util and shell_util code from chrome into a common lib -#include "win8/delegate_execute/chrome_util.h" +#include "chrome/installer/util/browser_distribution.h" +#include "chrome/installer/util/install_util.h" +#include "chrome/installer/util/shell_util.h" + #include "win8/metro_driver/winrt_utils.h" typedef winfoundtn::ITypedEventHandler< @@ -201,11 +202,13 @@ void ToastNotificationHandler::DisplayNotification( NOTREACHED() << "Failed to get chrome exe path"; return; } - string16 appid = delegate_execute::GetAppId(chrome_path); + + BrowserDistribution* dist = BrowserDistribution::GetDistribution(); + bool is_per_user_install = InstallUtil::IsPerUserInstall( + chrome_path.value().c_str()); + string16 appid = ShellUtil::GetBrowserModelId(dist, is_per_user_install); DVLOG(1) << "Chrome Appid is " << appid.c_str(); - // TODO(ananta) - // We should probably use BrowserDistribution here to get the product name. mswrw::HString app_user_model_id; app_user_model_id.Attach(MakeHString(appid)); |