diff options
| author | brettw <brettw@chromium.org> | 2016-02-01 16:19:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-02 00:20:47 +0000 |
| commit | b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36 (patch) | |
| tree | e60f5a4f77cbd196d75e1f03e5b7a8153941b4b6 /chrome/browser/prefs/chrome_pref_service_factory.cc | |
| parent | 913701b1fa2ea8a63f095454d8147d1a3b8262af (diff) | |
| download | chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.zip chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.tar.gz chromium_src-b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36.tar.bz2 | |
Update chrome for new prefs location.
This is a search-and-replace update for includes with "base/prefs" ->
"components/prefs" and the headers re-sorted in the chrome directory.
DEPS files were updated to allow the components in question to depend on
components/prefs. chrome/DEPS was updated to whitelist all components rather
than listing all the ones it uses out individually. Checkdeps is a tool to
enforce layering, and Chrome is allowed to depend on any component, so listing
each one it uses doesn't help anything.
This should be a no-op from a build perspective.
BUG=583034
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/1658793002
Cr-Commit-Position: refs/heads/master@{#372827}
Diffstat (limited to 'chrome/browser/prefs/chrome_pref_service_factory.cc')
| -rw-r--r-- | chrome/browser/prefs/chrome_pref_service_factory.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index 98c5fb1..15539f8 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -15,15 +15,6 @@ #include "base/macros.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/default_pref_store.h" -#include "base/prefs/json_pref_store.h" -#include "base/prefs/pref_filter.h" -#include "base/prefs/pref_notifier_impl.h" -#include "base/prefs/pref_registry.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/pref_store.h" -#include "base/prefs/pref_value_store.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" @@ -41,6 +32,15 @@ #include "chrome/grit/generated_resources.h" #include "components/component_updater/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/default_pref_store.h" +#include "components/prefs/json_pref_store.h" +#include "components/prefs/pref_filter.h" +#include "components/prefs/pref_notifier_impl.h" +#include "components/prefs/pref_registry.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/pref_store.h" +#include "components/prefs/pref_value_store.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/default_search_pref_migration.h" #include "components/search_engines/search_engines_pref_names.h" |