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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/i18n/case_conversion.h" 11 #include "base/i18n/case_conversion.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/prefs/pref_registry_simple.h"
16 #include "base/prefs/pref_service.h"
17 #include "base/prefs/scoped_user_pref_update.h"
18 #include "base/profiler/scoped_tracker.h" 15 #include "base/profiler/scoped_tracker.h"
19 #include "base/rand_util.h" 16 #include "base/rand_util.h"
20 #include "base/stl_util.h" 17 #include "base/stl_util.h"
21 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
22 #include "base/strings/string_piece.h" 19 #include "base/strings/string_piece.h"
23 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
24 #include "base/values.h" 21 #include "base/values.h"
25 #include "build/build_config.h" 22 #include "build/build_config.h"
26 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
27 #include "chrome/browser/profiles/profile_avatar_downloader.h" 24 #include "chrome/browser/profiles/profile_avatar_downloader.h"
28 #include "chrome/browser/profiles/profile_avatar_icon_util.h" 25 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
29 #include "chrome/browser/profiles/profiles_state.h" 26 #include "chrome/browser/profiles/profiles_state.h"
30 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
31 #include "chrome/grit/generated_resources.h" 28 #include "chrome/grit/generated_resources.h"
29 #include "components/prefs/pref_registry_simple.h"
30 #include "components/prefs/pref_service.h"
31 #include "components/prefs/scoped_user_pref_update.h"
32 #include "components/signin/core/common/profile_management_switches.h" 32 #include "components/signin/core/common/profile_management_switches.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
36 #include "ui/gfx/image/image.h" 36 #include "ui/gfx/image/image.h"
37 #include "ui/gfx/image/image_util.h" 37 #include "ui/gfx/image/image_util.h"
38 38
39 #if defined(ENABLE_SUPERVISED_USERS) 39 #if defined(ENABLE_SUPERVISED_USERS)
40 #include "chrome/browser/supervised_user/supervised_user_constants.h" 40 #include "chrome/browser/supervised_user/supervised_user_constants.h"
41 #endif 41 #endif
(...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 // The profile info is in the cache but its entry isn't created yet, insert 1374 // The profile info is in the cache but its entry isn't created yet, insert
1375 // it in the map. 1375 // it in the map.
1376 scoped_ptr<ProfileAttributesEntry> new_entry(new ProfileAttributesEntry()); 1376 scoped_ptr<ProfileAttributesEntry> new_entry(new ProfileAttributesEntry());
1377 profile_attributes_entries_.add(path, std::move(new_entry)); 1377 profile_attributes_entries_.add(path, std::move(new_entry));
1378 profile_attributes_entries_.get(path)->Initialize(this, path); 1378 profile_attributes_entries_.get(path)->Initialize(this, path);
1379 } 1379 }
1380 1380
1381 *entry = profile_attributes_entries_.get(path); 1381 *entry = profile_attributes_entries_.get(path);
1382 return true; 1382 return true;
1383 } 1383 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.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