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 /ash | |
| 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 'ash')
| -rw-r--r-- | ash/system/DEPS | 1 | ||||
| -rw-r--r-- | ash/system/chromeos/power/power_event_observer.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ash/system/DEPS b/ash/system/DEPS index 1121c69..246c8e1 100644 --- a/ash/system/DEPS +++ b/ash/system/DEPS @@ -1,4 +1,5 @@ include_rules = [ "-chromeos", + "+components/prefs", "+components/signin/core/account_id", ] diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc index 3dad764..284e09f 100644 --- a/ash/system/chromeos/power/power_event_observer.cc +++ b/ash/system/chromeos/power/power_event_observer.cc @@ -8,8 +8,8 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/power_button_controller.h" -#include "base/prefs/pref_service.h" #include "chromeos/dbus/dbus_thread_manager.h" +#include "components/prefs/pref_service.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/user_activity/user_activity_detector.h" |