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

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

Issue 117433002: Remove installation of Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indentation fix and new unittest Created 7 years 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/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index c8b071ce2d0cb37735ff6da664190179da6795df..2902d8ec2528712e4e47723b1d9b9ec6bb9176c7 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -507,17 +507,7 @@ InstallStatus InstallOrUpdateProduct(
const base::FilePath& prefs_path,
const MasterPreferences& prefs,
const Version& new_version) {
- // TODO(robertshield): Removing the pending on-reboot moves should be done
- // elsewhere.
- // TODO(erikwright): Understand why this is Chrome Frame only and whether
- // it also applies to App Host. Shouldn't it apply to any multi-install too?
- const Products& products = installer_state.products();
- DCHECK(products.size());
- if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME)) {
- // Make sure that we don't end up deleting installed files on next reboot.
- if (!RemoveFromMovesPendingReboot(installer_state.target_path()))
gab 2013/12/19 01:18:31 This appears to have been the only remaining call
grt (UTC plus 2) 2013/12/19 20:57:06 I've re-added Erik's TODO since I think it still a
gab 2013/12/20 19:05:54 Hmmm... so we're going to leave a call that's used
grt (UTC plus 2) 2013/12/23 17:58:34 Well, when you put it that way...
- LOG(ERROR) << "Error accessing pending moves value.";
- }
+ DCHECK(installer_state.products().size());
gab 2013/12/19 01:18:31 Replace check for foo.size(), but !foo.empty()
grt (UTC plus 2) 2013/12/19 20:57:06 Done.
// Create VisualElementManifest.xml in |src_path| (if required) so that it
// looks as if it had been extracted from the archive when calling

Powered by Google App Engine
This is Rietveld 408576698