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

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

Issue 100573002: Move directory creation 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 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 893
894 // Creates the sentinel indicating that the EULA was required and has been 894 // Creates the sentinel indicating that the EULA was required and has been
895 // accepted. 895 // accepted.
896 bool CreateEULASentinel(BrowserDistribution* dist) { 896 bool CreateEULASentinel(BrowserDistribution* dist) {
897 base::FilePath eula_sentinel; 897 base::FilePath eula_sentinel;
898 if (!InstallUtil::GetSentinelFilePath(installer::kEULASentinelFile, 898 if (!InstallUtil::GetSentinelFilePath(installer::kEULASentinelFile,
899 dist, &eula_sentinel)) { 899 dist, &eula_sentinel)) {
900 return false; 900 return false;
901 } 901 }
902 902
903 return (file_util::CreateDirectory(eula_sentinel.DirName()) && 903 return (base::CreateDirectory(eula_sentinel.DirName()) &&
904 file_util::WriteFile(eula_sentinel, "", 0) != -1); 904 file_util::WriteFile(eula_sentinel, "", 0) != -1);
905 } 905 }
906 906
907 void ActivateMetroChrome() { 907 void ActivateMetroChrome() {
908 // Check to see if we're per-user or not. Need to do this since we may 908 // Check to see if we're per-user or not. Need to do this since we may
909 // not have been invoked with --system-level even for a machine install. 909 // not have been invoked with --system-level even for a machine install.
910 wchar_t exe_path[MAX_PATH * 2] = {}; 910 wchar_t exe_path[MAX_PATH * 2] = {};
911 GetModuleFileName(NULL, exe_path, arraysize(exe_path)); 911 GetModuleFileName(NULL, exe_path, arraysize(exe_path));
912 bool is_per_user_install = InstallUtil::IsPerUserInstall(exe_path); 912 bool is_per_user_install = InstallUtil::IsPerUserInstall(exe_path);
913 913
(...skipping 945 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