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

chrome_frame/chrome_frame_automation.h

 // 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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
 #define CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_handle.h"
 #include "base/stack_container.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/timer.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/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
 // AutomationProxy ctor for details.
 const unsigned long kCommandExecutionTimeout = 60000;  // NOLINT, 60 seconds
 
 class ProxyFactory;
 class NavigationConstraints;
 enum AutomationPageFontSize;
 
@@ skipping 355 matching lines @@
   // Attaches an existing external tab to this automation client instance.
   void AttachExternalTab(uint64 external_tab_cookie);
   void BlockExternalTab(uint64 cookie);
 
   void SetPageFontSize(enum AutomationPageFontSize);
 
   // For IDeleteBrowsingHistorySupport
   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.
   void OnUnload(bool* should_unload);
 
   void set_route_all_top_level_navigations(
       bool route_all_top_level_navigations) {
     route_all_top_level_navigations_ = route_all_top_level_navigations;
   }
 
@@ skipping 106 matching lines @@
   // set to true if the host needs to get notified of all top level navigations
   // in this page. This typically applies to hosts which would render the new
   // page without chrome frame. Defaults to false.
   bool route_all_top_level_navigations_;
 
   friend class BeginNavigateContext;
   friend class CreateExternalTabContext;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_