diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 10:01:07 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-10 10:01:07 +0000 |
| commit | f87d7cb4ec8002c3df07e74dc9b31afcf4ad8b7d (patch) | |
| tree | 51d2b71b54eff946dbceec119d47d23358960f82 /chrome_frame | |
| parent | 5e194bc61b0c8a3072fb4a0d73106717ceba667e (diff) | |
| download | chromium_src-f87d7cb4ec8002c3df07e74dc9b31afcf4ad8b7d.zip chromium_src-f87d7cb4ec8002c3df07e74dc9b31afcf4ad8b7d.tar.gz chromium_src-f87d7cb4ec8002c3df07e74dc9b31afcf4ad8b7d.tar.bz2 | |
Split user agent code out of the 'glue' target
This creates a new user_agent component target for the user agent handling code. This makes it straightforward for iOS to build only the user-agent part of glue. It should also make incremental dismantling of webkit/ easier, since the dependencies on user agent code are now explicit.
The code that was in user_agent.cc/h (the webkit_user_agent target) has been moved to user_agent_util.cc/h, and folded into the user_agent component target. All user-agent related code has been moved to a new webkit/user_agent/ directory.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10869073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 | ||||
| -rw-r--r-- | chrome_frame/html_utils.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/renderer_glue.cc | 1 | ||||
| -rw-r--r-- | chrome_frame/test/html_util_unittests.cc | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index bc680dd..7526e9a 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -664,7 +664,7 @@ '../net/net.gyp:net', '../third_party/libxml/libxml.gyp:libxml', '../third_party/bzip2/bzip2.gyp:bzip2', - '../webkit/support/webkit_support.gyp:webkit_user_agent', + '../webkit/support/webkit_support.gyp:user_agent', ], 'sources': [ 'bho.cc', diff --git a/chrome_frame/html_utils.cc b/chrome_frame/html_utils.cc index 6892ede..3192f14 100644 --- a/chrome_frame/html_utils.cc +++ b/chrome_frame/html_utils.cc @@ -13,7 +13,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome_frame/utils.h" #include "net/base/net_util.h" -#include "webkit/glue/user_agent.h" +#include "webkit/user_agent/user_agent_util.h" const wchar_t kQuotes[] = L"\"'"; const char kXFrameOptionsHeader[] = "X-Frame-Options"; diff --git a/chrome_frame/renderer_glue.cc b/chrome_frame/renderer_glue.cc index 96ccdc1..b885492 100644 --- a/chrome_frame/renderer_glue.cc +++ b/chrome_frame/renderer_glue.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/glue/user_agent.h" #include "webkit/glue/webkit_glue.h" #include "chrome/common/chrome_version_info.h" diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc index 827dfc7..f5e8030 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -24,7 +24,7 @@ #include "chrome_frame/chrome_frame_delegate.h" #include "chrome_frame/html_utils.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/glue/user_agent.h" +#include "webkit/user_agent/user_agent_util.h" const char kChromeFrameUserAgent[] = "chromeframe"; |