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/io_thread.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/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 83b45f2..a048038 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -18,8 +18,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/metrics/field_trial.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" @@ -51,6 +49,8 @@ #include "components/data_usage/core/data_use_annotator.h" #include "components/net_log/chrome_net_log.h" #include "components/policy/core/common/policy_service.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/proxy_config/pref_proxy_config_tracker.h" #include "components/variations/variations_associated_data.h" #include "components/version_info/version_info.h" |