diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 23:32:29 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 23:32:29 +0000 |
| commit | a0a81442d80fda67fab9108e9018b8750da115b6 (patch) | |
| tree | bec38608be3ccfd2da6786375fe33a0347797ef4 /android_webview/native | |
| parent | d5f8440640aab5a07b1c98fe38e488e48362a6af (diff) | |
| download | chromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.zip chromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.tar.gz chromium_src-a0a81442d80fda67fab9108e9018b8750da115b6.tar.bz2 | |
Revert 203261 "split webkit/glue/webpreferences to common and re..."
Broke compile
> split webkit/glue/webpreferences to common and renderer
>
> TBR=jamesr@chromium.org
>
> BUG=239107
>
> Review URL: https://codereview.chromium.org/16216007
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/16232014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native')
| -rw-r--r-- | android_webview/native/aw_settings.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc index 8d44487..74356fe 100644 --- a/android_webview/native/aw_settings.cc +++ b/android_webview/native/aw_settings.cc @@ -15,8 +15,8 @@ #include "content/public/common/content_client.h" #include "jni/AwSettings_jni.h" #include "webkit/common/user_agent/user_agent.h" -#include "webkit/common/webpreferences.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/glue/webpreferences.h" using base::android::ConvertJavaStringToUTF16; using base::android::ConvertUTF8ToJavaString; |