summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 04:53:45 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-23 04:53:45 +0000
commit8468d2885dd17bb1837b589d6b3719d23d3160ba (patch)
tree4367b64d23049466b89cbdd74d2c6fd25972150f /chrome_frame
parent5175cf4c97927de502e944c056bae789da98926f (diff)
downloadchromium_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 'chrome_frame')
-rw-r--r--chrome_frame/html_utils.cc2
-rw-r--r--chrome_frame/test/html_util_unittests.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/html_utils.cc b/chrome_frame/html_utils.cc
index ef49b06..3f816b9 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/user_agent/user_agent_util.h"
+#include "webkit/common/user_agent/user_agent_util.h"
const wchar_t kQuotes[] = L"\"'";
const char kXFrameOptionsHeader[] = "X-Frame-Options";
diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc
index 66b0546..ca330d4 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/user_agent/user_agent_util.h"
+#include "webkit/common/user_agent/user_agent_util.h"
const char kChromeFrameUserAgent[] = "chromeframe";