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

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

Issue 99923002: Move temp file functions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 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/setup_main.h" 5 #include "chrome/installer/setup/setup_main.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <msi.h> 8 #include <msi.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <shlobj.h> 10 #include <shlobj.h>
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 base::FilePath* unpack_path) { 684 base::FilePath* unpack_path) {
685 DCHECK(temp_path && unpack_path); 685 DCHECK(temp_path && unpack_path);
686 686
687 if (!temp_path->Initialize(installer_state.target_path().DirName(), 687 if (!temp_path->Initialize(installer_state.target_path().DirName(),
688 installer::kInstallTempDir)) { 688 installer::kInstallTempDir)) {
689 PLOG(ERROR) << "Could not create temporary path."; 689 PLOG(ERROR) << "Could not create temporary path.";
690 return false; 690 return false;
691 } 691 }
692 VLOG(1) << "Created path " << temp_path->path().value(); 692 VLOG(1) << "Created path " << temp_path->path().value();
693 693
694 if (!file_util::CreateTemporaryDirInDir(temp_path->path(), 694 if (!base::CreateTemporaryDirInDir(temp_path->path(),
695 installer::kInstallSourceDir, 695 installer::kInstallSourceDir,
696 unpack_path)) { 696 unpack_path)) {
697 PLOG(ERROR) << "Could not create temporary path for unpacked archive."; 697 PLOG(ERROR) << "Could not create temporary path for unpacked archive.";
698 return false; 698 return false;
699 } 699 }
700 700
701 return true; 701 return true;
702 } 702 }
703 703
704 installer::InstallStatus InstallProducts( 704 installer::InstallStatus InstallProducts(
705 const InstallationState& original_state, 705 const InstallationState& original_state,
706 const CommandLine& cmd_line, 706 const CommandLine& cmd_line,
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1859 // Call the newly updated setup.exe with kUncompressedArchive and 1859 // Call the newly updated setup.exe with kUncompressedArchive and
1860 // kMigrateChromeFrame to perform the migration. 1860 // kMigrateChromeFrame to perform the migration.
1861 LaunchChromeFrameMigrationProcess(*chrome_frame_state, cmd_line, 1861 LaunchChromeFrameMigrationProcess(*chrome_frame_state, cmd_line,
1862 installer_directory, system_install); 1862 installer_directory, system_install);
1863 } 1863 }
1864 1864
1865 VLOG(1) << "Installation complete, returning: " << return_code; 1865 VLOG(1) << "Installation complete, returning: " << return_code;
1866 1866
1867 return return_code; 1867 return return_code;
1868 } 1868 }
OLDNEW
« no previous file with comments | « chrome/installer/setup/install_unittest.cc ('k') | chrome/installer/setup/setup_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698