diff options
| author | brettw <brettw@chromium.org> | 2016-02-02 16:51:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-03 00:52:49 +0000 |
| commit | 1f5feb7e317e3c257090858e950273b64a2e31ef (patch) | |
| tree | 9322f3ed006e3c0b0a383fc1439e61ba3674118d /ios/chrome/browser/bookmarks | |
| parent | e788ae26ee13d972ac0299bd121978cfc7185fb1 (diff) | |
| download | chromium_src-1f5feb7e317e3c257090858e950273b64a2e31ef.zip chromium_src-1f5feb7e317e3c257090858e950273b64a2e31ef.tar.gz chromium_src-1f5feb7e317e3c257090858e950273b64a2e31ef.tar.bz2 | |
Delete base/prefs and update callers to use components.
Deletes the forwarding headers in base/prefs.
Updates the remaining users of base/prefs includes to use components/prefs.
Sort headers in updated files.
Move PrefServiceFactory out of the base namespace. Update users.
Update all preprocessor stuff in components/prefs to change BASE_PREFS_ to
COMPONENTS_PREFS_.
Add components/prefs to DEPS file of directories where checkdeps fails after
the update.
BUG=583034
Review URL: https://codereview.chromium.org/1662523004
Cr-Commit-Position: refs/heads/master@{#373105}
Diffstat (limited to 'ios/chrome/browser/bookmarks')
| -rw-r--r-- | ios/chrome/browser/bookmarks/bookmark_model_factory.cc | 2 | ||||
| -rw-r--r-- | ios/chrome/browser/bookmarks/bookmarks_utils.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc index d199a67..08ae8dc 100644 --- a/ios/chrome/browser/bookmarks/bookmark_model_factory.cc +++ b/ios/chrome/browser/bookmarks/bookmark_model_factory.cc @@ -7,11 +7,11 @@ #include <utility> #include "base/memory/singleton.h" -#include "base/prefs/pref_service.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/startup_task_runner_service.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h" +#include "components/prefs/pref_service.h" #include "components/undo/bookmark_undo_service.h" #include "ios/chrome/browser/bookmarks/bookmark_client_impl.h" #include "ios/chrome/browser/bookmarks/startup_task_runner_service_factory.h" diff --git a/ios/chrome/browser/bookmarks/bookmarks_utils.cc b/ios/chrome/browser/bookmarks/bookmarks_utils.cc index 9d4f378..3c1085f 100644 --- a/ios/chrome/browser/bookmarks/bookmarks_utils.cc +++ b/ios/chrome/browser/bookmarks/bookmarks_utils.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" -#include "base/prefs/pref_service.h" #include "components/bookmarks/browser/bookmark_model.h" +#include "components/prefs/pref_service.h" #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h" #include "ios/chrome/browser/pref_names.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" |