Move PageZoom enum into content/public/common and into the content namespace. Also move content_costants to content/public/common.

BUG=98716
Review URL: http://codereview.chromium.org/8413051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107804 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 14 insertions, 14 deletions

diff --git a/chrome_frame/cfproxy.h b/chrome_frame/cfproxy.h
index 6bc8abd..e5169dc 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 "content/common/page_zoom.h"
+#include "content/public/common/page_zoom.h"
 #include "ipc/ipc_channel.h"
 
 class ChromeProxyDelegate;
@@ -93,7 +93,7 @@ class ChromeProxy {
   virtual void Tab_MenuCommand(int tab, int selected_command) = 0;
 
   // UI
-  virtual void Tab_Zoom(int tab, PageZoom::Function zoom_level) = 0;
+  virtual void Tab_Zoom(int tab, content::PageZoom zoom_level) = 0;
   virtual void Tab_FontSize(int tab, enum AutomationPageFontSize font_size) = 0;
   virtual void Tab_SetInitialFocus(int tab,
       bool reverse, bool restore_focus_to_view) = 0;
diff --git a/chrome_frame/cfproxy_private.h b/chrome_frame/cfproxy_private.h
index 61778e1d..de52039 100644
--- a/chrome_frame/cfproxy_private.h
+++ b/chrome_frame/cfproxy_private.h
@@ -80,7 +80,7 @@ class Interface2IPCMessage : public ChromeProxy {
   virtual void Tab_Paste(int tab);
   virtual void Tab_SelectAll(int tab);
   virtual void Tab_MenuCommand(int tab, int selected_command);
-  virtual void Tab_Zoom(int tab, PageZoom::Function zoom_level);
+  virtual void Tab_Zoom(int tab, content::PageZoom zoom_level);
   virtual void Tab_FontSize(int tab, enum AutomationPageFontSize font_size);
   virtual void Tab_SetInitialFocus(int tab, bool reverse,
                                    bool restore_focus_to_view);
diff --git a/chrome_frame/cfproxy_support.cc b/chrome_frame/cfproxy_support.cc
index 777c854..903397d 100644
--- a/chrome_frame/cfproxy_support.cc
+++ b/chrome_frame/cfproxy_support.cc
@@ -116,7 +116,7 @@ void Interface2IPCMessage::Tab_MenuCommand(int tab, int selected_command) {
       tab, selected_command));
 }
 
-void Interface2IPCMessage::Tab_Zoom(int tab, PageZoom::Function zoom_level) {
+void Interface2IPCMessage::Tab_Zoom(int tab, content::PageZoom zoom_level) {
   sender_->Send(new AutomationMsg_SetZoomLevel(tab, zoom_level));
 }
 
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index cf903e9..1ee9070 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -35,7 +35,7 @@
 #include "chrome_frame/crash_reporting/crash_metrics.h"
 #include "chrome_frame/utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/page_zoom.h"
+#include "content/public/common/page_zoom.h"
 #include "grit/generated_resources.h"
 
 DEFINE_GUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0, 0xC0, 0, 0, 0, 0, 0, 0,
@@ -896,9 +896,9 @@ void ChromeActiveDocument::OnSetZoomRange(const GUID* cmd_group_guid,
 
   if (in_args && V_VT(in_args) == VT_I4 && IsValid()) {
     if (in_args->lVal == kZoomIn) {
-      automation_client_->SetZoomLevel(PageZoom::ZOOM_IN);
+      automation_client_->SetZoomLevel(content::PAGE_ZOOM_IN);
     } else if (in_args->lVal == kZoomOut) {
-      automation_client_->SetZoomLevel(PageZoom::ZOOM_OUT);
+      automation_client_->SetZoomLevel(content::PAGE_ZOOM_OUT);
     } else {
       DLOG(WARNING) << "Unsupported zoom level:" << in_args->lVal;
     }
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 61f6ce1..4f6c57c 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -1210,7 +1210,7 @@ void ChromeFrameAutomationClient::SetUrlFetcher(
   url_fetcher_->set_delegate(this);
 }
 
-void ChromeFrameAutomationClient::SetZoomLevel(PageZoom::Function zoom_level) {
+void ChromeFrameAutomationClient::SetZoomLevel(content::PageZoom zoom_level) {
   if (automation_server_) {
     automation_server_->Send(new AutomationMsg_SetZoomLevel(tab_handle_,
                                                             zoom_level));
diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 5209c35..83a3e0b 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -23,7 +23,7 @@
 #include "chrome_frame/chrome_frame_delegate.h"
 #include "chrome_frame/plugin_url_request.h"
 #include "chrome_frame/sync_msg_reply_dispatcher.h"
-#include "content/common/page_zoom.h"
+#include "content/public/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
@@ -399,7 +399,7 @@ class ChromeFrameAutomationClient
   void RemoveBrowsingData(int remove_mask);
 
   // Sets the current zoom level on the tab.
-  void SetZoomLevel(PageZoom::Function zoom_level);
+  void SetZoomLevel(content::PageZoom zoom_level);
 
   // Fires before unload and unload handlers on the page if any. Allows the
   // the website to put up a confirmation dialog on unload.
diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc
index 38e74aa..0e5b044 100644
--- a/chrome_frame/external_tab.cc
+++ b/chrome_frame/external_tab.cc
@@ -191,7 +191,7 @@ void ExternalTabProxy::BlockExternalTab(uint64 cookie) {
   proxy_->BlockTab(cookie);
 }
 
-void ExternalTabProxy::SetZoomLevel(PageZoom::Function zoom_level) {
+void ExternalTabProxy::SetZoomLevel(content::PageZoom zoom_level) {
   proxy_->Tab_Zoom(tab_, zoom_level);
 }
 
diff --git a/chrome_frame/external_tab.h b/chrome_frame/external_tab.h
index 26abf8f..2ac46a5 100644
--- a/chrome_frame/external_tab.h
+++ b/chrome_frame/external_tab.h
@@ -19,7 +19,7 @@
 #include "chrome/common/automation_constants.h"
 #include "chrome_frame/cfproxy.h"
 #include "chrome_frame/task_marshaller.h"
-#include "content/common/page_zoom.h"
+#include "content/public/common/page_zoom.h"
 #include "googleurl/src/gurl.h"
 
 class Task;
@@ -116,7 +116,7 @@ class ExternalTabProxy : public CWindowImpl<ExternalTabProxy>,
   virtual void ConnectToExternalTab(uint64 external_tab_cookie);
   virtual void BlockExternalTab(uint64 cookie);
 
-  void SetZoomLevel(PageZoom::Function zoom_level);
+  void SetZoomLevel(content::PageZoom zoom_level);
 
  private:
   BEGIN_MSG_MAP(ExternalTabProxy)
diff --git a/chrome_frame/external_tab_test.cc b/chrome_frame/external_tab_test.cc
index 9a30508..0069522 100644
--- a/chrome_frame/external_tab_test.cc
+++ b/chrome_frame/external_tab_test.cc
@@ -73,7 +73,7 @@ struct MockProxy : public ChromeProxy {
       FindInPageDirection forward, FindInPageCase match_case, bool find_next));
   MOCK_METHOD2(Tab_MenuCommand, void(int tab, int selected_command));
 
-  MOCK_METHOD2(Tab_Zoom, void(int tab, PageZoom::Function zoom_level));
+  MOCK_METHOD2(Tab_Zoom, void(int tab, content::PageZoom zoom_level));
   MOCK_METHOD2(Tab_FontSize, void(int tab, AutomationPageFontSize font_size));
   MOCK_METHOD3(Tab_SetInitialFocus, void(int tab, bool reverse,
       bool restore_focus_to_view));