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

Side by Side Diff: chrome/browser/profiles/profile_info_cache.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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/profiles/profile_info_cache.h" 5 #include "chrome/browser/profiles/profile_info_cache.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/i18n/case_conversion.h" 9 #include "base/i18n/case_conversion.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/pref_registry_simple.h" 12 #include "base/prefs/pref_registry_simple.h"
13 #include "base/prefs/pref_service.h" 13 #include "base/prefs/pref_service.h"
14 #include "base/prefs/scoped_user_pref_update.h" 14 #include "base/prefs/scoped_user_pref_update.h"
15 #include "base/rand_util.h" 15 #include "base/rand_util.h"
16 #include "base/stl_util.h" 16 #include "base/stl_util.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/strings/string_piece.h" 18 #include "base/strings/string_piece.h"
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 std::vector<base::FilePath>::const_iterator it; 1099 std::vector<base::FilePath>::const_iterator it;
1100 for (it = profiles_to_rename.begin(); it != profiles_to_rename.end(); ++it) { 1100 for (it = profiles_to_rename.begin(); it != profiles_to_rename.end(); ++it) {
1101 size_t profile_index = GetIndexOfProfileWithPath(*it); 1101 size_t profile_index = GetIndexOfProfileWithPath(*it);
1102 SetProfileIsUsingDefaultNameAtIndex(profile_index, true); 1102 SetProfileIsUsingDefaultNameAtIndex(profile_index, true);
1103 // This will assign a new "Person %d" type name and re-sort the cache. 1103 // This will assign a new "Person %d" type name and re-sort the cache.
1104 SetNameOfProfileAtIndex(profile_index, ChooseNameForNewProfile( 1104 SetNameOfProfileAtIndex(profile_index, ChooseNameForNewProfile(
1105 GetAvatarIconIndexOfProfileAtIndex(profile_index))); 1105 GetAvatarIconIndexOfProfileAtIndex(profile_index)));
1106 } 1106 }
1107 #endif 1107 #endif
1108 } 1108 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_info_cache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698