summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 00:13:56 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 00:13:56 +0000
commit1caa9261639f9275071d172ba2711bb792093d55 (patch)
tree4b82d5bc2652dfe4f86ed124e6ce4f7bbfaf6e0a /chrome/installer/util
parentbc1eae2c47e4bda12bf2319ee9547a690870744f (diff)
downloadchromium_src-1caa9261639f9275071d172ba2711bb792093d55.zip
chromium_src-1caa9261639f9275071d172ba2711bb792093d55.tar.gz
chromium_src-1caa9261639f9275071d172ba2711bb792093d55.tar.bz2
Win: Use different AppUserModelID for SxS installs.
BUG=44572 TEST=see bug Review URL: http://codereview.chromium.org/2616002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/browser_distribution.cc4
-rw-r--r--chrome/installer/util/browser_distribution.h2
-rw-r--r--chrome/installer/util/google_chrome_distribution.cc5
-rw-r--r--chrome/installer/util/google_chrome_distribution.h2
-rw-r--r--chrome/installer/util/google_chrome_sxs_distribution.cc5
-rw-r--r--chrome/installer/util/google_chrome_sxs_distribution.h1
-rw-r--r--chrome/installer/util/shell_util.cc34
7 files changed, 37 insertions, 16 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index da35d7a..4220005 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -71,6 +71,10 @@ std::wstring BrowserDistribution::GetAlternateApplicationName() {
return L"The Internet";
}
+std::wstring BrowserDistribution::GetBrowserAppId() {
+ return L"Chromium";
+}
+
std::wstring BrowserDistribution::GetInstallSubDir() {
return L"Chromium";
}
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index c9be526..bedfee4 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -31,6 +31,8 @@ class BrowserDistribution {
virtual std::wstring GetAlternateApplicationName();
+ virtual std::wstring GetBrowserAppId();
+
virtual std::wstring GetInstallSubDir();
virtual std::wstring GetPublisherName();
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index b1b22df..bd085e0 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -37,6 +37,7 @@
namespace {
const wchar_t kChromeGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
+const wchar_t kBrowserAppId[] = L"Chrome";
// The following strings are the possible outcomes of the toast experiment
// as recorded in the |client| field. Previously the groups used "TSxx" but
@@ -357,6 +358,10 @@ std::wstring GoogleChromeDistribution::GetAlternateApplicationName() {
return alt_product_name;
}
+std::wstring GoogleChromeDistribution::GetBrowserAppId() {
+ return kBrowserAppId;
+}
+
std::wstring GoogleChromeDistribution::GetInstallSubDir() {
std::wstring sub_dir(installer_util::kGoogleChromeInstallSubDir1);
sub_dir.append(L"\\");
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index fec4df2..75999da 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -36,6 +36,8 @@ class GoogleChromeDistribution : public BrowserDistribution {
virtual std::wstring GetAlternateApplicationName();
+ virtual std::wstring GetBrowserAppId();
+
virtual std::wstring GetInstallSubDir();
// This method generates the new value for Google Update "ap" key for Chrome
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc
index 381f171..b979405 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.cc
+++ b/chrome/installer/util/google_chrome_sxs_distribution.cc
@@ -12,6 +12,7 @@ namespace {
const wchar_t kChromeSxSGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}";
const wchar_t kChannelName[] = L"canary";
+const wchar_t kBrowserAppId[] = L"ChromeCanary";
const int kSxSIconIndex = 4;
} // namespace
@@ -26,6 +27,10 @@ std::wstring GoogleChromeSxSDistribution::GetAppShortCutName() {
return shortcut_name;
}
+std::wstring GoogleChromeSxSDistribution::GetBrowserAppId() {
+ return kBrowserAppId;
+}
+
std::wstring GoogleChromeSxSDistribution::GetInstallSubDir() {
return GoogleChromeDistribution::GetInstallSubDir().append(
installer_util::kSxSSuffix);
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.h b/chrome/installer/util/google_chrome_sxs_distribution.h
index 0e8ce49..7b1d408 100644
--- a/chrome/installer/util/google_chrome_sxs_distribution.h
+++ b/chrome/installer/util/google_chrome_sxs_distribution.h
@@ -20,6 +20,7 @@
class GoogleChromeSxSDistribution : public GoogleChromeDistribution {
public:
virtual std::wstring GetAppShortCutName();
+ virtual std::wstring GetBrowserAppId();
virtual std::wstring GetInstallSubDir();
virtual std::wstring GetUninstallRegPath();
virtual std::wstring GetEnvVersionKey();
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index 561f2e9..dda1d1e 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -778,22 +778,24 @@ bool ShellUtil::UpdateChromeShortcut(const std::wstring& chrome_exe,
installer_util::master_preferences::kChromeShortcutIconIndex,
&icon_index);
if (create_new) {
- return file_util::CreateShortcutLink(chrome_exe.c_str(), // target
- shortcut.c_str(), // shortcut
- chrome_path.c_str(), // working dir
- NULL, // arguments
- description.c_str(), // description
- chrome_exe.c_str(), // icon file
- icon_index, // icon index
- chrome::kBrowserAppID); // app id
+ return file_util::CreateShortcutLink(
+ chrome_exe.c_str(), // target
+ shortcut.c_str(), // shortcut
+ chrome_path.c_str(), // working dir
+ NULL, // arguments
+ description.c_str(), // description
+ chrome_exe.c_str(), // icon file
+ icon_index, // icon index
+ dist->GetBrowserAppId().c_str()); // app id
} else {
- return file_util::UpdateShortcutLink(chrome_exe.c_str(), // target
- shortcut.c_str(), // shortcut
- chrome_path.c_str(), // working dir
- NULL, // arguments
- description.c_str(), // description
- chrome_exe.c_str(), // icon file
- icon_index, // icon index
- chrome::kBrowserAppID); // app id
+ return file_util::UpdateShortcutLink(
+ chrome_exe.c_str(), // target
+ shortcut.c_str(), // shortcut
+ chrome_path.c_str(), // working dir
+ NULL, // arguments
+ description.c_str(), // description
+ chrome_exe.c_str(), // icon file
+ icon_index, // icon index
+ dist->GetBrowserAppId().c_str()); // app id
}
}
generated by cgit v1.1 at 2025-03-03 12:19:56 +0000