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

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

Issue 6402: Fix some problems with machine level install. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | chrome/installer/setup/setup.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #include <string> 5 #include <string>
6 #include <windows.h> 6 #include <windows.h>
7 #include <msi.h> 7 #include <msi.h>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 } 265 }
266 266
267 // Delete install temporary directory. 267 // Delete install temporary directory.
268 LOG(INFO) << "Deleting temporary directory " << temp_path; 268 LOG(INFO) << "Deleting temporary directory " << temp_path;
269 scoped_ptr<DeleteTreeWorkItem> delete_tree( 269 scoped_ptr<DeleteTreeWorkItem> delete_tree(
270 WorkItem::CreateDeleteTreeWorkItem(temp_path, std::wstring())); 270 WorkItem::CreateDeleteTreeWorkItem(temp_path, std::wstring()));
271 delete_tree->Do(); 271 delete_tree->Do();
272 272
273 BrowserDistribution* dist = BrowserDistribution::GetDistribution(); 273 BrowserDistribution* dist = BrowserDistribution::GetDistribution();
274 dist->UpdateDiffInstallStatus(system_install, incremental_install, 274 dist->UpdateDiffInstallStatus(system_install, incremental_install,
275 install_status); 275 install_status);
276 return install_status; 276 return install_status;
277 } 277 }
278 278
279 installer_util::InstallStatus UninstallChrome(const CommandLine& cmd_line, 279 installer_util::InstallStatus UninstallChrome(const CommandLine& cmd_line,
280 const installer::Version* version, 280 const installer::Version* version,
281 bool system_install) { 281 bool system_install) {
282 bool remove_all = true; 282 bool remove_all = true;
283 if (cmd_line.HasSwitch(installer_util::switches::kDoNotRemoveSharedItems)) 283 if (cmd_line.HasSwitch(installer_util::switches::kDoNotRemoveSharedItems))
284 remove_all = false; 284 remove_all = false;
285 LOG(INFO) << "Uninstalling Chome"; 285 LOG(INFO) << "Uninstalling Chome";
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 install_status = InstallChrome(parsed_command_line, 349 install_status = InstallChrome(parsed_command_line,
350 installed_version.get(), 350 installed_version.get(),
351 system_install); 351 system_install);
352 } 352 }
353 353
354 CoUninitialize(); 354 CoUninitialize();
355 BrowserDistribution* dist = BrowserDistribution::GetDistribution(); 355 BrowserDistribution* dist = BrowserDistribution::GetDistribution();
356 return dist->GetInstallReturnCode(install_status); 356 return dist->GetInstallReturnCode(install_status);
357 } 357 }
358 358
OLDNEW
« no previous file with comments | « chrome/installer/setup/install.cc ('k') | chrome/installer/setup/setup.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698