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

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

Issue 11359013: Adding App Launcher shortcuts on install. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with refactor_chrome_shortcut_op. Created 8 years, 1 month 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
Index: chrome/installer/setup/uninstall.cc
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index d670288580e985278c87e2c19c7059ea50a26e67..1706cee7c8559fb7790ef00deb17d0d3b659b1c1 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -256,6 +256,11 @@ void CloseChromeFrameHelperProcess() {
}
}
+// Deletes shortcuts at |install_level| from Start menu, Desktop,
erikwright (departed) 2012/11/07 21:15:30 I guess this is to be removed?
huangs 2012/11/07 21:41:59 I was trying to see if there's anything that can b
gab 2012/11/07 21:44:40 I'd say the opposite, add "taskbar" to this list a
huangs 2012/11/07 22:14:46 Done, replaced old comment with 3-line comment.
+// Quick Launch, and secondary tiles on the Start Screen (Win8+).
+// Only shortcuts pointing to |target| will be removed.
+
+
// This method deletes the product's shortcut folder from the
// Windows Start menu. It checks system_uninstall to see if the shortcut is
// in all users start menu or current user start menu.
@@ -1053,6 +1058,16 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
}
}
+ if (product.is_chrome_app_host()) {
+ // Remove this check once we have system-level App Host.
gab 2012/11/07 21:44:40 Add TODO in front of comment.
huangs 2012/11/07 22:14:46 Done.
+ DCHECK(!installer_state.system_install());
+ const string16 app_host_exe(
+ installer_state.target_path().Append(installer::kChromeAppHostExe)
+ .value());
+ // Delete shortcuts from Start menu, Desktop, and Quick Launch.
+ DeleteShortcuts(installer_state, product, app_host_exe);
+ }
+
// Chrome is not in use so lets uninstall Chrome by deleting various files
// and registry entries. Here we will just make best effort and keep going
// in case of errors.
@@ -1067,7 +1082,7 @@ InstallStatus UninstallProduct(const InstallationState& original_state,
auto_launch_util::DisableAllAutoStartFeatures(
ASCIIToUTF16(chrome::kInitialProfile));
- // First delete shortcuts from Start->Programs, Desktop & Quick Launch.
+ // Delete shortcuts from Start menu, Desktop, and Quick Launch.
gab 2012/11/07 21:44:40 This comment is now also missing taskbar and start
huangs 2012/11/07 22:14:46 Done (removed both comments from the 2 callers).
DeleteShortcuts(installer_state, product, chrome_exe);
}

Powered by Google App Engine
This is Rietveld 408576698