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

chrome_frame/chrome_active_document.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Implementation of ChromeActiveDocument
 #include "chrome_frame/chrome_active_document.h"
 
 #include <hlink.h>
 #include <htiface.h>
 #include <initguid.h>
@@ skipping 17 matching lines @@
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/bind_context_info.h"
 #include "chrome_frame/buggy_bho_handling.h"
 #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,
             0x46);
 
 bool g_first_launch_by_process_ = true;
 
 const DWORD kIEEncodingIdArray[] = {
 #define DEFINE_ENCODING_ID_ARRAY(encoding_name, id, chrome_name) encoding_name,
   INTERNAL_IE_ENCODINGMENU_IDS(DEFINE_ENCODING_ID_ARRAY)
@@ skipping 840 matching lines @@
 void ChromeActiveDocument::OnSetZoomRange(const GUID* cmd_group_guid,
                                           DWORD command_id,
                                           DWORD cmd_exec_opt,
                                           VARIANT* in_args,
                                           VARIANT* out_args) {
   const int kZoomIn = 125;
   const int kZoomOut = 75;
 
   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;
     }
   }
 }
 
 void ChromeActiveDocument::OnUnload(const GUID* cmd_group_guid,
                                     DWORD command_id,
                                     DWORD cmd_exec_opt,
                                     VARIANT* in_args,
@@ skipping 492 matching lines @@
     return true;
 
   if (new_navigation_info.url != navigation_info_->url)
     return true;
 
   if (new_navigation_info.referrer != navigation_info_->referrer)
     return true;
 
   return false;
 }