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

Side by Side Diff: chrome/browser/first_run/first_run.cc

Issue 18332014: Move Copy* into the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/browser/first_run/first_run.h" 5 #include "chrome/browser/first_run/first_run.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 } 328 }
329 329
330 bool CopyPrefFile(const base::FilePath& user_data_dir, 330 bool CopyPrefFile(const base::FilePath& user_data_dir,
331 const base::FilePath& master_prefs_path) { 331 const base::FilePath& master_prefs_path) {
332 base::FilePath user_prefs = GetDefaultPrefFilePath(true, user_data_dir); 332 base::FilePath user_prefs = GetDefaultPrefFilePath(true, user_data_dir);
333 if (user_prefs.empty()) 333 if (user_prefs.empty())
334 return false; 334 return false;
335 335
336 // The master prefs are regular prefs so we can just copy the file 336 // The master prefs are regular prefs so we can just copy the file
337 // to the default place and they just work. 337 // to the default place and they just work.
338 return file_util::CopyFile(master_prefs_path, user_prefs); 338 return base::CopyFile(master_prefs_path, user_prefs);
339 } 339 }
340 340
341 void SetupMasterPrefsFromInstallPrefs( 341 void SetupMasterPrefsFromInstallPrefs(
342 const installer::MasterPreferences& install_prefs, 342 const installer::MasterPreferences& install_prefs,
343 MasterPrefs* out_prefs) { 343 MasterPrefs* out_prefs) {
344 ConvertStringVectorToGURLVector( 344 ConvertStringVectorToGURLVector(
345 install_prefs.GetFirstRunTabs(), &out_prefs->new_tabs); 345 install_prefs.GetFirstRunTabs(), &out_prefs->new_tabs);
346 346
347 install_prefs.GetInt(installer::master_preferences::kDistroPingDelay, 347 install_prefs.GetInt(installer::master_preferences::kDistroPingDelay,
348 &out_prefs->ping_delay); 348 &out_prefs->ping_delay);
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 SetShouldDoPersonalDataManagerFirstRun(); 772 SetShouldDoPersonalDataManagerFirstRun();
773 773
774 internal::DoPostImportPlatformSpecificTasks(profile); 774 internal::DoPostImportPlatformSpecificTasks(profile);
775 } 775 }
776 776
777 uint16 auto_import_state() { 777 uint16 auto_import_state() {
778 return g_auto_import_state; 778 return g_auto_import_state;
779 } 779 }
780 780
781 } // namespace first_run 781 } // namespace first_run
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698