Give SxS distribution its own registration GUIDs.

win8/metro_driver/toast_notification_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "win8/metro_driver/stdafx.h"
 #include "win8/metro_driver/toast_notification_handler.h"
 
 #include "base/files/file_path.h"
 #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<
     winui::Notifications::ToastNotification*, IInspectable*>
     ToastActivationHandler;
 
 typedef winfoundtn::ITypedEventHandler<
     winui::Notifications::ToastNotification*,
     winui::Notifications::ToastDismissedEventArgs*> ToastDismissedHandler;
 
@@ skipping 167 matching lines @@
 
   hr = toast_notification_factory->CreateToastNotification(
       toast_xml.Get(), &notification_);
   CheckHR(hr);
 
   base::FilePath chrome_path;
   if (!PathService::Get(base::FILE_EXE, &chrome_path)) {
     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));
 
   hr = toast_manager->CreateToastNotifierWithId(app_user_model_id.Get(),
                                                 &notifier_);
   CheckHR(hr);
 
   hr = notification_->add_Activated(
       mswr::Callback<ToastActivationHandler>(
           this, &ToastNotificationHandler::OnActivate).Get(),
@@ skipping 21 matching lines @@
   // etc to ChromeAppView which would enable it to ensure that the
   // correct tab in chrome is activated.
   DVLOG(1) << __FUNCTION__;
 
   if (notification_info_.notification_handler) {
     notification_info_.notification_handler(
         notification_info_.notification_context.c_str());
   }
   return S_OK;
 }