diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 04:53:45 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 04:53:45 +0000 |
| commit | 8468d2885dd17bb1837b589d6b3719d23d3160ba (patch) | |
| tree | 4367b64d23049466b89cbdd74d2c6fd25972150f /android_webview | |
| parent | 5175cf4c97927de502e944c056bae789da98926f (diff) | |
| download | chromium_src-8468d2885dd17bb1837b589d6b3719d23d3160ba.zip chromium_src-8468d2885dd17bb1837b589d6b3719d23d3160ba.tar.gz chromium_src-8468d2885dd17bb1837b589d6b3719d23d3160ba.tar.bz2 | |
Move webkit/user_agent/ into webkit/common
webkit/user_agent/ defines a tidy little library that depends on almost nothing
and can be used in any process. This moves it into webkit/common/user_agent/.
It's still linked as a separate component in the shared_library build.
BUG=237267
R=darin
Review URL: https://chromiumcodereview.appspot.com/15702003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/common/aw_content_client.cc | 2 | ||||
| -rw-r--r-- | android_webview/native/aw_settings.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc index 053215d..d6f31ef 100644 --- a/android_webview/common/aw_content_client.cc +++ b/android_webview/common/aw_content_client.cc @@ -8,7 +8,7 @@ #include "ipc/ipc_message.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "webkit/user_agent/user_agent_util.h" +#include "webkit/common/user_agent/user_agent_util.h" namespace android_webview { diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc index 5a34704..74356fe 100644 --- a/android_webview/native/aw_settings.cc +++ b/android_webview/native/aw_settings.cc @@ -14,9 +14,9 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" #include "jni/AwSettings_jni.h" +#include "webkit/common/user_agent/user_agent.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" -#include "webkit/user_agent/user_agent.h" using base::android::ConvertJavaStringToUTF16; using base::android::ConvertUTF8ToJavaString; |