diff options
| author | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 04:22:13 +0000 |
|---|---|---|
| committer | calamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 04:22:13 +0000 |
| commit | 16fcc0d188d193f2c2963988cd62427d719c3c6c (patch) | |
| tree | 98b877d7b991bfc95246ffbc840c0b5d276775c8 /chrome/installer/setup/uninstall.cc | |
| parent | 98e469afcf1adef4e3f7d81f540e735070f41981 (diff) | |
| download | chromium_src-16fcc0d188d193f2c2963988cd62427d719c3c6c.zip chromium_src-16fcc0d188d193f2c2963988cd62427d719c3c6c.tar.gz chromium_src-16fcc0d188d193f2c2963988cd62427d719c3c6c.tar.bz2 | |
Refactor of BrowserDistribution.
This is a precursor to https://codereview.chromium.org/13864015/.
* Added GetStartMenuShortcutSubfolder, which returns the Start Menu
subfolder path for a given subfolder.
* GetShortcutName and GetIconIndex now return data specific to a type
of shortcut (browser, alternate name of browser, or app launcher).
* GetDisplayName is now used rather than GetAppShortcutName where a
localized name is needed (e.g., in logs and the registry).
BUG=233434,238895,161985
Review URL: https://chromiumcodereview.appspot.com/15255004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/uninstall.cc')
| -rw-r--r-- | chrome/installer/setup/uninstall.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index 30af416..7f8e7ce 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -103,7 +103,7 @@ void AddChannelValueUpdateWorkItems( product_state != NULL && product_state->is_multi_install()) << "Channel value for " << BrowserDistribution::GetSpecificDistribution( - dist_type)->GetAppShortCutName() + dist_type)->GetDisplayName() << " is somehow already set to the desired new value of " << channel_info.value(); } @@ -940,7 +940,7 @@ void UninstallActiveSetupEntries(const InstallerState& installer_state, const char* install_level = installer_state.system_install() ? "system" : "user"; VLOG(1) << "No Active Setup processing to do for " << install_level - << "-level " << distribution->GetAppShortCutName(); + << "-level " << distribution->GetDisplayName(); return; } @@ -1079,7 +1079,7 @@ InstallStatus UninstallProduct(const InstallationState& original_state, bool is_chrome = product.is_chrome(); - VLOG(1) << "UninstallProduct: " << browser_dist->GetAppShortCutName(); + VLOG(1) << "UninstallProduct: " << browser_dist->GetDisplayName(); if (force_uninstall) { // Since --force-uninstall command line option is used, we are going to |