diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 07:06:18 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 07:06:18 +0000 |
| commit | fab55e79fa25eb384f4698850a0c7c9fdd7352a7 (patch) | |
| tree | e310ae687cab547cfff9bc050c28acd082bdadc2 /android_webview | |
| parent | 2130a837fc486c170bc5ea2b214a25260232336d (diff) | |
| download | chromium_src-fab55e79fa25eb384f4698850a0c7c9fdd7352a7.zip chromium_src-fab55e79fa25eb384f4698850a0c7c9fdd7352a7.tar.gz chromium_src-fab55e79fa25eb384f4698850a0c7c9fdd7352a7.tar.bz2 | |
reland of 'split webkit/glue/webpreferences to common and renderer'
Reland of https://codereview.chromium.org/16216007 with merge fixed.
TBR=jamesr@chromium.org
BUG=239107
Review URL: https://chromiumcodereview.appspot.com/15788004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -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 74356fe..8d44487 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; |