Suffix Chrome's appid on user-level installs

chrome/browser/shell_integration_win.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 "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 275 matching lines @@
   }
 
   string16 app_name;
   if (command_line.HasSwitch(switches::kApp)) {
     app_name = UTF8ToUTF16(web_app::GenerateApplicationNameFromURL(
         GURL(command_line.GetSwitchValueASCII(switches::kApp))));
   } else if (command_line.HasSwitch(switches::kAppId)) {
     app_name = UTF8ToUTF16(web_app::GenerateApplicationNameFromExtensionId(
         command_line.GetSwitchValueASCII(switches::kAppId)));
   } else {
-    app_name = BrowserDistribution::GetDistribution()->GetBrowserAppId();
+    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+    app_name = ShellUtil::GetBrowserModelId(dist, chrome_exe.value());
   }
 
-  expected_app_id->assign(ShellIntegration::GetAppId(app_name, profile_path));
+  expected_app_id->assign(
+      ShellIntegration::GetAppModelIdForProfile(app_name, profile_path));
   return true;
 }
 
 void MigrateWin7ShortcutsInPath(
     const FilePath& chrome_exe, const FilePath& path) {
   // Enumerate all pinned shortcuts in the given path directly.
   file_util::FileEnumerator shortcuts_enum(
       path, false,  // not recursive
       file_util::FileEnumerator::FILES, FILE_PATH_LITERAL("*.lnk"));
 
@@ skipping 233 matching lines @@
     key_path.append(ShellUtil::kRegShellOpen);
     base::win::RegKey key(HKEY_CLASSES_ROOT, key_path.c_str(), KEY_READ);
     string16 app_cmd;
     if (key.Valid() && (key.ReadValue(L"", &app_cmd) == ERROR_SUCCESS) &&
         string16::npos != StringToLowerASCII(app_cmd).find(L"firefox"))
       ff_default = true;
   }
   return ff_default;
 }
 
-string16 ShellIntegration::GetAppId(const string16& app_name,
-                                    const FilePath& profile_path) {
-  string16 app_id(app_name);
-
-  string16 profile_id(GetProfileIdFromPath(profile_path));
-  if (!profile_id.empty()) {
-    app_id += L".";
-    app_id += profile_id;
-  }
-
-  // App id should be less than 128 chars.
-  DCHECK(app_id.length() < 128);
-  return app_id;
+string16 ShellIntegration::GetAppModelIdForProfile(
+    const string16& app_name,
+    const FilePath& profile_path) {
+  std::vector<string16> components;
+  components.push_back(app_name);
+  const string16 profile_id(GetProfileIdFromPath(profile_path));
+  if (!profile_id.empty())
+    components.push_back(profile_id);
+  return ShellUtil::BuildAppModelId(components);
 }
 
-string16 ShellIntegration::GetChromiumAppId(const FilePath& profile_path) {
-  return GetAppId(BrowserDistribution::GetDistribution()->GetBrowserAppId(),
-                  profile_path);
+string16 ShellIntegration::GetChromiumModelIdForProfile(
+    const FilePath& profile_path) {
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  FilePath chrome_exe;
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED();
+    return dist->GetBaseAppId();
+  }
+  return GetAppModelIdForProfile(
+      ShellUtil::GetBrowserModelId(dist, chrome_exe.value()), profile_path);
 }
 
 string16 ShellIntegration::GetChromiumIconPath() {
   // Determine the app path. If we can't determine what that is, we have
   // bigger fish to fry...
   FilePath app_path;
   if (!PathService::Get(base::FILE_EXE, &app_path)) {
     NOTREACHED();
     return string16();
   }
 
   string16 icon_path(app_path.value());
   icon_path.push_back(',');
   icon_path += base::IntToString16(
       BrowserDistribution::GetDistribution()->GetIconIndex());
   return icon_path;
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&MigrateChromiumShortcutsCallback));
 }
 
 bool ShellIntegration::ActivateMetroChrome() {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  const string16 app_id(dist->GetBrowserAppId());
+  FilePath chrome_exe;
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED();
+    return false;
+  }
+  const string16 app_id(
+      ShellUtil::GetBrowserModelId(dist, chrome_exe.value()));
   return ActivateApplication(app_id);
 }