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

Side by Side Diff: chrome/installer/setup/uninstall.cc

Issue 11299024: Revert 168080 - Configure system-level Chrome settings (i.e. install its shortcuts) immediately fol… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This file defines the methods useful for uninstalling Chrome. 5 // This file defines the methods useful for uninstalling Chrome.
6 6
7 #include "chrome/installer/setup/uninstall.h" 7 #include "chrome/installer/setup/uninstall.h"
8 8
9 #include <windows.h> 9 #include <windows.h>
10 10
(...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1263 VLOG(1) << "Uninstallation complete. Launching post-uninstall operations."; 1263 VLOG(1) << "Uninstallation complete. Launching post-uninstall operations.";
1264 browser_dist->DoPostUninstallOperations(product_state->version(), 1264 browser_dist->DoPostUninstallOperations(product_state->version(),
1265 backup_state_file, distribution_data); 1265 backup_state_file, distribution_data);
1266 } 1266 }
1267 1267
1268 // Try and delete the preserved local state once the post-install 1268 // Try and delete the preserved local state once the post-install
1269 // operations are complete. 1269 // operations are complete.
1270 if (!backup_state_file.empty()) 1270 if (!backup_state_file.empty())
1271 file_util::Delete(backup_state_file, false); 1271 file_util::Delete(backup_state_file, false);
1272 1272
1273 // Upon uninstalling user-level Chrome, install shortcuts to the system-level
1274 // Chrome if it exists (in most such cases the user-level uninstall is a
1275 // self-destruction).
1276 if (product.is_chrome() && !installer_state.system_install()) {
1277 const ProductState* system_level_product_state =
1278 original_state.GetProductState(true, browser_dist->GetType());
1279 if (system_level_product_state) {
1280 FilePath system_chrome_path(GetChromeInstallPath(true, browser_dist));
1281 HandleActiveSetupForBrowser(system_chrome_path, product, true);
1282 }
1283 }
1284
1285 return ret; 1273 return ret;
1286 } 1274 }
1287 1275
1288 } // namespace installer 1276 } // namespace installer
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698