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 /webkit/support | |
| 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 'webkit/support')
| -rw-r--r-- | webkit/support/webkit_support.cc | 4 | ||||
| -rw-r--r-- | webkit/support/webkit_support.gyp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index f344933c..0930902 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -52,6 +52,8 @@ #include "ui/gl/gl_surface.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/base/file_path_string_conversions.h" +#include "webkit/common/user_agent/user_agent.h" +#include "webkit/common/user_agent/user_agent_util.h" #include "webkit/fileapi/isolated_context.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitplatformsupport_impl.h" @@ -78,8 +80,6 @@ #include "webkit/tools/test_shell/simple_dom_storage_system.h" #include "webkit/tools/test_shell/simple_file_system.h" #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" -#include "webkit/user_agent/user_agent.h" -#include "webkit/user_agent/user_agent_util.h" #if defined(OS_ANDROID) #include "base/test/test_support_android.h" diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp index 4eed048..4519488 100644 --- a/webkit/support/webkit_support.gyp +++ b/webkit/support/webkit_support.gyp @@ -4,7 +4,7 @@ { 'includes': [ - '../user_agent/webkit_user_agent.gypi', + '../common/user_agent/webkit_user_agent.gypi', ], 'conditions': [ # TODO(stuartmorgan): All dependencies from code built on iOS to |