summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/cfproxy.h2
-rw-r--r--chrome_frame/chrome_active_document.cc4
-rw-r--r--chrome_frame/chrome_frame_automation.h2
-rw-r--r--chrome_frame/external_tab.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/cfproxy.h b/chrome_frame/cfproxy.h
index 6386738..ca3aa84 100644
--- a/chrome_frame/cfproxy.h
+++ b/chrome_frame/cfproxy.h
@@ -14,7 +14,7 @@
#include "base/time.h" // for base::TimeDelta
#include "base/file_path.h"
#include "chrome/common/automation_constants.h"
-#include "chrome/common/page_zoom.h"
+#include "content/common/page_zoom.h"
#include "ipc/ipc_channel.h"
enum FindInPageDirection { BACK = 0, FWD = 1 };
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 7cffc97..bccc255 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -35,8 +35,6 @@
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/common/automation_messages.h"
#include "chrome/common/chrome_constants.h"
-#include "chrome/common/navigation_types.h"
-#include "chrome/common/page_zoom.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome_frame/bho.h"
@@ -45,6 +43,8 @@
#include "chrome_frame/crash_reporting/crash_metrics.h"
#include "chrome_frame/utils.h"
#include "content/browser/tab_contents/tab_contents.h"
+#include "content/common/navigation_types.h"
+#include "content/common/page_zoom.h"
DEFINE_GUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0, 0xC0, 0, 0, 0, 0, 0, 0,
0x46);
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
diff --git a/chrome_frame/external_tab.h b/chrome_frame/external_tab.h
index ac7aff3..15e9778 100644
--- a/chrome_frame/external_tab.h
+++ b/chrome_frame/external_tab.h
@@ -15,9 +15,9 @@
#include "base/scoped_ptr.h"
#include "base/time.h"
#include "chrome/common/automation_constants.h"
-#include "chrome/common/page_zoom.h"
#include "chrome_frame/cfproxy.h"
#include "chrome_frame/task_marshaller.h"
+#include "content/common/page_zoom.h"
#include "googleurl/src/gurl.h"
class Task;