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

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

Issue 2764963002: Move ProgID methods from BrowserDistribution into install_static. (Closed)
Patch Set: huangs comments Created 3 years, 9 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 | « chrome/install_static/install_util.cc ('k') | chrome/installer/util/browser_distribution.h » ('j') | no next file with comments »
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 d0122073df81bbf1d6b48c7f95c5e99135427759..739b6d0562ce6bee0173655c4cc86df150ee31db 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -440,9 +440,8 @@ void RemoveFiletypeRegistration(const InstallerState& installer_state,
base::string16 classes_path(ShellUtil::kRegClasses);
classes_path.push_back(base::FilePath::kSeparators[0]);
- BrowserDistribution* distribution = BrowserDistribution::GetDistribution();
- const base::string16 prog_id(
- distribution->GetBrowserProgIdPrefix() + browser_entry_suffix);
+ const base::string16 prog_id(install_static::GetProgIdPrefix() +
+ 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
@@ -639,8 +638,9 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state,
base::FilePath chrome_exe(installer_state.target_path().Append(kChromeExe));
// Delete Software\Classes\ChromeHTML.
- const base::string16 prog_id(
- dist->GetBrowserProgIdPrefix() + browser_entry_suffix);
+ DCHECK_EQ(BrowserDistribution::GetDistribution(), dist);
+ const base::string16 prog_id(install_static::GetProgIdPrefix() +
+ browser_entry_suffix);
base::string16 reg_prog_id(ShellUtil::kRegClasses);
reg_prog_id.push_back(base::FilePath::kSeparators[0]);
reg_prog_id.append(prog_id);
@@ -651,7 +651,6 @@ bool DeleteChromeRegistrationKeys(const InstallerState& installer_state,
reg_app_id.push_back(base::FilePath::kSeparators[0]);
// Append the requested suffix manually here (as ShellUtil::GetBrowserModelId
// would otherwise try to figure out the currently installed suffix).
- DCHECK_EQ(BrowserDistribution::GetDistribution(), dist);
reg_app_id.append(install_static::GetBaseAppId() + browser_entry_suffix);
InstallUtil::DeleteRegistryKey(root, reg_app_id, WorkItem::kWow64Default);
« no previous file with comments | « chrome/install_static/install_util.cc ('k') | chrome/installer/util/browser_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698