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

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 1548133002: Switch to standard integer types in chrome/browser/, part 3 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/prefs/chrome_pref_service_factory.h" 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
6 6
7 #include <stddef.h>
8
7 #include <string> 9 #include <string>
8 #include <vector> 10 #include <vector>
9 11
10 #include "base/bind.h" 12 #include "base/bind.h"
11 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
12 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/macros.h"
13 #include "base/metrics/field_trial.h" 16 #include "base/metrics/field_trial.h"
14 #include "base/metrics/histogram_macros.h" 17 #include "base/metrics/histogram_macros.h"
15 #include "base/prefs/default_pref_store.h" 18 #include "base/prefs/default_pref_store.h"
16 #include "base/prefs/json_pref_store.h" 19 #include "base/prefs/json_pref_store.h"
17 #include "base/prefs/pref_filter.h" 20 #include "base/prefs/pref_filter.h"
18 #include "base/prefs/pref_notifier_impl.h" 21 #include "base/prefs/pref_notifier_impl.h"
19 #include "base/prefs/pref_registry.h" 22 #include "base/prefs/pref_registry.h"
20 #include "base/prefs/pref_registry_simple.h" 23 #include "base/prefs/pref_registry_simple.h"
21 #include "base/prefs/pref_service.h" 24 #include "base/prefs/pref_service.h"
22 #include "base/prefs/pref_store.h" 25 #include "base/prefs/pref_store.h"
23 #include "base/prefs/pref_value_store.h" 26 #include "base/prefs/pref_value_store.h"
24 #include "base/threading/sequenced_worker_pool.h" 27 #include "base/threading/sequenced_worker_pool.h"
25 #include "base/time/time.h" 28 #include "base/time/time.h"
26 #include "base/trace_event/trace_event.h" 29 #include "base/trace_event/trace_event.h"
30 #include "build/build_config.h"
27 #include "chrome/browser/browser_process.h" 31 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/prefs/chrome_pref_model_associator_client.h" 32 #include "chrome/browser/prefs/chrome_pref_model_associator_client.h"
29 #include "chrome/browser/prefs/command_line_pref_store.h" 33 #include "chrome/browser/prefs/command_line_pref_store.h"
30 #include "chrome/browser/prefs/profile_pref_store_manager.h" 34 #include "chrome/browser/prefs/profile_pref_store_manager.h"
31 #include "chrome/browser/profiles/profile.h" 35 #include "chrome/browser/profiles/profile.h"
32 #include "chrome/browser/sync/glue/sync_start_util.h" 36 #include "chrome/browser/sync/glue/sync_start_util.h"
33 #include "chrome/browser/ui/profile_error_dialog.h" 37 #include "chrome/browser/ui/profile_error_dialog.h"
34 #include "chrome/common/chrome_constants.h" 38 #include "chrome/common/chrome_constants.h"
35 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
36 #include "chrome/grit/chromium_strings.h" 40 #include "chrome/grit/chromium_strings.h"
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 553
550 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 554 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
551 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 555 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
552 } 556 }
553 557
554 void RegisterPrefs(PrefRegistrySimple* registry) { 558 void RegisterPrefs(PrefRegistrySimple* registry) {
555 ProfilePrefStoreManager::RegisterPrefs(registry); 559 ProfilePrefStoreManager::RegisterPrefs(registry);
556 } 560 }
557 561
558 } // namespace chrome_prefs 562 } // namespace chrome_prefs
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/prefs/chrome_pref_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698