diff options
| author | msw <msw@chromium.org> | 2016-02-02 17:25:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-03 01:26:34 +0000 |
| commit | 456d842422a8cf9954ebeab7615059a0129812de (patch) | |
| tree | 66113703585a40588dcb52d8bbf779805b8f3788 /android_webview/native | |
| parent | 91375c125e08b6b53bb7c7e3eaedab1ef7c08a0b (diff) | |
| download | chromium_src-456d842422a8cf9954ebeab7615059a0129812de.zip chromium_src-456d842422a8cf9954ebeab7615059a0129812de.tar.gz chromium_src-456d842422a8cf9954ebeab7615059a0129812de.tar.bz2 | |
Revert of Delete base/prefs and update callers to use components. (patchset #3 id:40001 of https://codereview.chromium.org/1662523004/ )
Reason for revert:
Broke Win Builder compile:
https://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/19463/steps/compile/logs/stdio
Original issue's description:
> 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
>
> Committed: https://crrev.com/1f5feb7e317e3c257090858e950273b64a2e31ef
> Cr-Commit-Position: refs/heads/master@{#373105}
TBR=estade@chromium.org,brettw@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=583034
Review URL: https://codereview.chromium.org/1662843002
Cr-Commit-Position: refs/heads/master@{#373115}
Diffstat (limited to 'android_webview/native')
| -rw-r--r-- | android_webview/native/aw_autofill_client.cc | 6 | ||||
| -rw-r--r-- | android_webview/native/aw_autofill_client.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/android_webview/native/aw_autofill_client.cc b/android_webview/native/aw_autofill_client.cc index e70afc2..cb7b646 100644 --- a/android_webview/native/aw_autofill_client.cc +++ b/android_webview/native/aw_autofill_client.cc @@ -13,13 +13,13 @@ #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" #include "base/logging.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service.h" +#include "base/prefs/pref_service_factory.h" #include "components/autofill/core/browser/autofill_popup_delegate.h" #include "components/autofill/core/browser/suggestion.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/autofill/core/common/autofill_pref_names.h" -#include "components/prefs/pref_registry_simple.h" -#include "components/prefs/pref_service.h" -#include "components/prefs/pref_service_factory.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/android_webview/native/aw_autofill_client.h b/android_webview/native/aw_autofill_client.h index da8a685..78cfa96 100644 --- a/android_webview/native/aw_autofill_client.h +++ b/android_webview/native/aw_autofill_client.h @@ -11,9 +11,9 @@ #include "base/android/jni_weak_ref.h" #include "base/compiler_specific.h" #include "base/macros.h" +#include "base/prefs/pref_registry_simple.h" +#include "base/prefs/pref_service_factory.h" #include "components/autofill/core/browser/autofill_client.h" -#include "components/prefs/pref_registry_simple.h" -#include "components/prefs/pref_service_factory.h" #include "content/public/browser/web_contents_user_data.h" namespace autofill { |