summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_automation.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 06:06:12 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 06:06:12 +0000
commit4dd5793c22cc4e9991055adcb4e7163fbba8c246 (patch)
treefb2307f59725643e4c4ce8d4f215188fd8920bdd /chrome_frame/chrome_frame_automation.h
parent7e06cb9f6a1bfd890eebd08195a903a58912cdc9 (diff)
downloadchromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.zip
chromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.tar.gz
chromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.tar.bz2
Move the remaining files in chrome\common to content\common.
TBR=avi Review URL: http://codereview.chromium.org/6672070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.h')
-rw-r--r--chrome_frame/chrome_frame_automation.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 738b7c3..9c56602 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -18,13 +18,13 @@
#include "base/task.h"
#include "base/threading/thread.h"
#include "base/timer.h"
-#include "chrome/common/page_zoom.h"
#include "chrome/test/automation/automation_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome_frame/chrome_frame_delegate.h"
#include "chrome_frame/chrome_frame_histograms.h"
#include "chrome_frame/plugin_url_request.h"
#include "chrome_frame/sync_msg_reply_dispatcher.h"
+#include "content/common/page_zoom.h"
// By a convoluated route, this timeout also winds up being the sync automation
// message timeout. See the ChromeFrameAutomationProxyImpl ctor and the