| Index: chrome/installer/setup/uninstall.cc
|
| diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
|
| index 8693dfa834d46f353876cf4909977a942142f695..fdfcb7558728c0ac5961dfc3ecee10daae4af7c5 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
|
| @@ -801,7 +803,7 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state,
|
| const string16& browser_entry_suffix,
|
| InstallStatus* exit_code) {
|
| DCHECK(exit_code);
|
| - if (!dist->CanSetAsDefault()) {
|
| + if (!dist->IsSetAsDefaultSupported()) {
|
| // We should have never set those keys.
|
| return true;
|
| }
|
| @@ -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);
|
|
|