Changes to content/ to facilitate new zoom extension API

content/public/browser/web_contents.h

 // Copyright (c) 2012 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 CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/process/kill.h"
 #include "base/strings/string16.h"
 #include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/save_page_type.h"
 #include "content/public/browser/web_ui.h"
+#include "content/public/common/page_zoom.h"
 #include "content/public/common/stop_find_action.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
 #endif
@@ skipping 386 matching lines @@
   // bombing), see DownloadRequestLimiter for details.
   virtual void UserGestureDone() = 0;
 
   // Indicates if this tab was explicitly closed by the user (control-w, close
   // tab menu item...). This is false for actions that indirectly close the tab,
   // such as closing the window.  The setter is maintained by TabStripModel, and
   // the getter only useful from within TAB_CLOSED notification
   virtual void SetClosedByUserGesture(bool value) = 0;
   virtual bool GetClosedByUserGesture() const = 0;
 
+  // Gets the flag indicating whether zooming will have default behavior.
+  virtual ZoomMode GetZoomMode() const = 0;
+
   // Gets the zoom level for this tab.
   virtual double GetZoomLevel() const = 0;
 
   // Gets the zoom percent for this tab.
   virtual int GetZoomPercent(bool* enable_increment,
                              bool* enable_decrement) const = 0;
 
   // Opens view-source tab for this contents.
   virtual void ViewSource() = 0;
 
@@ skipping 50 matching lines @@
                             bool is_favicon,
                             uint32_t max_bitmap_size,
                             const ImageDownloadCallback& callback) = 0;
 
   // Returns true if the WebContents is responsible for displaying a subframe
   // in a different process from its parent page.
   // TODO: this doesn't really belong here. With site isolation, this should be
   // removed since we can then embed iframes in different processes.
   virtual bool IsSubframe() const = 0;
 
+  // Sets the flag indicating whether zooming will have default behavior.
+  virtual void SetZoomMode(ZoomMode mode) = 0;
+
   // Sets the zoom level for the current page and all BrowserPluginGuests
-  // within the page.
-  virtual void SetZoomLevel(double level) = 0;
+  // within the page. Returns the zoom_id of the zoom change.
+  virtual int SetZoomLevel(double level) = 0;
 
   // Finds text on a page.
   virtual void Find(int request_id,
                     const base::string16& search_text,
                     const blink::WebFindOptions& options) = 0;
 
   // Notifies the renderer that the user has closed the FindInPage window
   // (and what action to take regarding the selection).
   virtual void StopFinding(StopFindAction action) = 0;
 
 #if defined(OS_ANDROID)
   CONTENT_EXPORT static WebContents* FromJavaWebContents(
       jobject jweb_contents_android);
   virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() = 0;
 #endif  // OS_ANDROID
 
  private:
   // This interface should only be implemented inside content.
   friend class WebContentsImpl;
   WebContents() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_