Enable EULA dialog to be shown from metro Chrome.

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 198 matching lines @@
   // These entries need to be registered in HKLM prior to Win8.
   static void GetProgIdEntries(BrowserDistribution* dist,
                                const string16& chrome_exe,
                                const string16& suffix,
                                ScopedVector<RegistryEntry>* entries) {
     string16 icon_path(ShellUtil::GetChromeIcon(dist, chrome_exe));
     string16 open_cmd(ShellUtil::GetChromeShellOpenCmd(chrome_exe));
     string16 delegate_command(ShellUtil::GetChromeDelegateCommand(chrome_exe));
     // For user-level installs: entries for the app id and DelegateExecute verb
     // handler will be in HKCU; thus we do not need a suffix on those entries.
-    string16 app_id(ShellUtil::GetBrowserModelId(dist, chrome_exe));
+    string16 app_id(
+        ShellUtil::GetBrowserModelId(
+            dist, InstallUtil::IsPerUserInstall(chrome_exe.c_str())));
     string16 delegate_guid;
     // TODO(grt): remove HasDelegateExecuteHandler when the exe is ever-present;
     // see also install_worker.cc's AddDelegateExecuteWorkItems.
     bool set_delegate_execute =
         IsChromeMetroSupported() &&
         dist->GetCommandExecuteImplClsid(&delegate_guid) &&
         InstallUtil::HasDelegateExecuteHandler(dist, chrome_exe);
 
     // DelegateExecute ProgId. Needed for Chrome Metro in Windows 8.
     if (set_delegate_execute) {
@@ skipping 515 matching lines @@
 // also become irrelevant sometime after Windows 8 RC (thus the aforementioned
 // removal date remains correct).
 void RemoveBadWindows8RegistrationIfNeeded(
     BrowserDistribution* dist,
     const string16& chrome_exe) {
   if (dist->GetCommandExecuteImplClsid(NULL) &&
       (!InstallUtil::HasDelegateExecuteHandler(dist, chrome_exe) ||
        !IsChromeMetroSupported())) {
     // There's no need to rollback, so forgo the usual work item lists and just
     // remove the values from the registry.
-    const HKEY root_key = InstallUtil::IsPerUserInstall(chrome_exe.c_str()) ?
-        HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
+    bool is_per_user_install =
+        InstallUtil::IsPerUserInstall(chrome_exe.c_str());
+    const HKEY root_key = is_per_user_install ? HKEY_CURRENT_USER :
+                                                HKEY_LOCAL_MACHINE;
     // Use the current installation's suffix, not the about-to-be-installed
     // suffix.
     const string16 installation_suffix(
         ShellUtil::GetCurrentInstallationSuffix(dist, chrome_exe));
-    const string16 app_id(ShellUtil::GetBrowserModelId(dist, chrome_exe));
+    const string16 app_id(ShellUtil::GetBrowserModelId(dist,
+                                                       is_per_user_install));
 
     // <root hkey>\Software\Classes\<app_id>
     string16 key(ShellUtil::kRegClasses);
     key.push_back(FilePath::kSeparators[0]);
     key.append(app_id);
     InstallUtil::DeleteRegistryKey(root_key, key);
 
     // <root hkey>\Software\Classes\ChromiumHTML[.user]\shell\open\command
     key = ShellUtil::kRegClasses;
     key.push_back(FilePath::kSeparators[0]);
@@ skipping 434 matching lines @@
 }
 
 string16 ShellUtil::GetApplicationName(BrowserDistribution* dist,
                                        const string16& chrome_exe) {
   string16 app_name = dist->GetBaseAppName();
   app_name += GetCurrentInstallationSuffix(dist, chrome_exe);
   return app_name;
 }
 
 string16 ShellUtil::GetBrowserModelId(BrowserDistribution* dist,
-                                      const string16& chrome_exe) {
+                                      bool is_per_user_install) {
   string16 app_id(dist->GetBaseAppId());
   string16 suffix;
-  if (InstallUtil::IsPerUserInstall(chrome_exe.c_str()) &&
-      !GetUserSpecificRegistrySuffix(&suffix)) {
+  if (is_per_user_install && !GetUserSpecificRegistrySuffix(&suffix)) {
     NOTREACHED();
   }
   // There is only one component (i.e. the suffixed appid) in this case, but it
   // is still necessary to go through the appid constructor to make sure the
   // returned appid is truncated if necessary.
   std::vector<string16> components(1, app_id.append(suffix));
   return BuildAppModelId(components);
 }
 
 string16 ShellUtil::BuildAppModelId(
@@ skipping 394 matching lines @@
     return;
 
   FilePath app_shortcuts_path;
   if (!PathService::Get(base::DIR_APP_SHORTCUTS, &app_shortcuts_path)) {
     LOG(ERROR) << "Could not get application shortcuts location to delete"
                << " start screen shortcuts.";
     return;
   }
 
   app_shortcuts_path = app_shortcuts_path.Append(
-      GetBrowserModelId(dist, chrome_exe));
+      GetBrowserModelId(dist,
+                        InstallUtil::IsPerUserInstall(chrome_exe.c_str())));
   if (!file_util::DirectoryExists(app_shortcuts_path)) {
     VLOG(1) << "No start screen shortcuts to delete.";
     return;
   }
 
   VLOG(1) << "Removing start screen shortcuts from "
           << app_shortcuts_path.value();
   if (!file_util::Delete(app_shortcuts_path, true)) {
     LOG(ERROR) << "Failed to remove start screen shortcuts from "
                << app_shortcuts_path.value();
@@ skipping 10 matching lines @@
                                      uint32 options) {
   const FilePath chrome_path(FilePath(chrome_exe).DirName());
 
   installer::MasterPreferences prefs(
       chrome_path.AppendASCII(installer::kDefaultMasterPrefs));
   if (FilePath::CompareEqualIgnoreCase(icon_path, chrome_exe)) {
     prefs.GetInt(installer::master_preferences::kChromeShortcutIconIndex,
                  &icon_index);
   }
 
-  const string16 app_id(GetBrowserModelId(dist, chrome_exe));
+  const string16 app_id(
+      GetBrowserModelId(dist,
+                        InstallUtil::IsPerUserInstall(chrome_exe.c_str())));
   const bool is_dual_mode = ((options & ShellUtil::SHORTCUT_DUAL_MODE) != 0);
   const base::win::ShortcutOperation operation =
       (options & ShellUtil::SHORTCUT_CREATE_ALWAYS) != 0 ?
           base::win::SHORTCUT_CREATE_ALWAYS :
           base::win::SHORTCUT_UPDATE_EXISTING;
 
   // TODO(gab): The shell_util interface will also be refactored in an upcoming
   // CL to use a ShortcutProperties like interface for its shortcut methods.
   base::win::ShortcutProperties shortcut_properties;
   shortcut_properties.set_target(FilePath(chrome_exe));
@@ skipping 67 matching lines @@
     // are any left...).
     if (free_bits >= 8 && next_byte_index < size) {
       free_bits -= 8;
       bit_stream += bytes[next_byte_index++] << free_bits;
     }
   }
 
   DCHECK_EQ(ret.length(), encoded_length);
   return ret;
 }