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

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

Issue 10818021: Revert 147650 - Implement installation of the Chrome App Host. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1215/src/
Patch Set: Created 8 years, 5 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
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 #include "chrome/installer/setup/install.h" 5 #include "chrome/installer/setup/install.h"
6 6
7 #include <shlobj.h> 7 #include <shlobj.h>
8 #include <time.h> 8 #include <time.h>
9 #include <winuser.h> 9 #include <winuser.h>
10 10
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 const FilePath& archive_path, 420 const FilePath& archive_path,
421 const FilePath& install_temp_path, 421 const FilePath& install_temp_path,
422 const FilePath& prefs_path, 422 const FilePath& prefs_path,
423 const MasterPreferences& prefs, 423 const MasterPreferences& prefs,
424 const Version& new_version) { 424 const Version& new_version) {
425 FilePath src_path(install_temp_path); 425 FilePath src_path(install_temp_path);
426 src_path = src_path.Append(kInstallSourceDir).Append(kInstallSourceChromeDir); 426 src_path = src_path.Append(kInstallSourceDir).Append(kInstallSourceChromeDir);
427 427
428 // TODO(robertshield): Removing the pending on-reboot moves should be done 428 // TODO(robertshield): Removing the pending on-reboot moves should be done
429 // elsewhere. 429 // elsewhere.
430 // TODO(erikwright): Understand why this is Chrome Frame only and whether
431 // it also applies to App Host. Shouldn't it apply to any multi-install too?
432 const Products& products = installer_state.products(); 430 const Products& products = installer_state.products();
433 DCHECK(products.size()); 431 DCHECK(products.size());
434 if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME)) { 432 if (installer_state.FindProduct(BrowserDistribution::CHROME_FRAME)) {
435 // Make sure that we don't end up deleting installed files on next reboot. 433 // Make sure that we don't end up deleting installed files on next reboot.
436 if (!RemoveFromMovesPendingReboot( 434 if (!RemoveFromMovesPendingReboot(
437 installer_state.target_path().value().c_str())) { 435 installer_state.target_path().value().c_str())) {
438 LOG(ERROR) << "Error accessing pending moves value."; 436 LOG(ERROR) << "Error accessing pending moves value.";
439 } 437 }
440 } 438 }
441 439
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 installer_state.RemoveOldVersionDirectories( 544 installer_state.RemoveOldVersionDirectories(
547 new_version, 545 new_version,
548 existing_version.get(), 546 existing_version.get(),
549 install_temp_path); 547 install_temp_path);
550 } 548 }
551 549
552 return result; 550 return result;
553 } 551 }
554 552
555 } // namespace installer 553 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/setup/chrome_frame_quick_enable.cc ('k') | chrome/installer/setup/install_worker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698