Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1935)

Unified Diff: chrome/installer/setup/uninstall.cc

Issue 23258005: Give SxS distribution its own registration GUIDs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move typedef Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/util/browser_distribution.h » ('j') | chrome/installer/util/install_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 8693dfa834d46f353876cf4909977a942142f695..4b258c800f2491e78ff57e9976c0b0bb26938a09 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -736,7 +736,9 @@ void RemoveFiletypeRegistration(const InstallerState& installer_state,
string16 classes_path(ShellUtil::kRegClasses);
classes_path.push_back(base::FilePath::kSeparators[0]);
- const string16 prog_id(ShellUtil::kChromeHTMLProgId + browser_entry_suffix);
+ BrowserDistribution* distribution = BrowserDistribution::GetDistribution();
+ const string16 prog_id(
+ distribution->GetBrowserProgIdPrefix() + browser_entry_suffix);
// Delete each filetype association if it references this Chrome. Take care
// not to delete the association if it references a system-level install of
@@ -809,7 +811,8 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state,
base::FilePath chrome_exe(installer_state.target_path().Append(kChromeExe));
// Delete Software\Classes\ChromeHTML.
- const string16 prog_id(ShellUtil::kChromeHTMLProgId + browser_entry_suffix);
+ const string16 prog_id(
+ dist->GetBrowserProgIdPrefix() + browser_entry_suffix);
string16 reg_prog_id(ShellUtil::kRegClasses);
reg_prog_id.push_back(base::FilePath::kSeparators[0]);
reg_prog_id.append(prog_id);
« no previous file with comments | « no previous file | chrome/installer/util/browser_distribution.h » ('j') | chrome/installer/util/install_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698