Changes to content/ to facilitate new zoom extension API

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 18e9ceab00afb145dbe61cffbc2599caa8b42dca..77f5e369d509b2561bee8f299c3c32ba0cdb58ff 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -266,6 +266,7 @@ class CONTENT_EXPORT WebContentsImpl
   virtual void UserGestureDone() OVERRIDE;
   virtual void SetClosedByUserGesture(bool value) OVERRIDE;
   virtual bool GetClosedByUserGesture() const OVERRIDE;
+  virtual ZoomMode GetZoomMode() const OVERRIDE;
   virtual double GetZoomLevel() const OVERRIDE;
   virtual int GetZoomPercent(bool* enable_increment,
                              bool* enable_decrement) const OVERRIDE;
@@ -287,7 +288,8 @@ class CONTENT_EXPORT WebContentsImpl
   virtual void Find(int request_id,
                     const base::string16& search_text,
                     const blink::WebFindOptions& options) OVERRIDE;
-  virtual void SetZoomLevel(double level) OVERRIDE;
+  virtual void SetZoomMode(ZoomMode mode) OVERRIDE;
+  virtual int SetZoomLevel(double level) OVERRIDE;
   virtual void StopFinding(StopFindAction action) OVERRIDE;
 #if defined(OS_ANDROID)
   virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents()
@@ -1051,6 +1053,12 @@ class CONTENT_EXPORT WebContentsImpl
   // different process from its parent page.
   bool is_subframe_;
 
+  // Defines how zoom changes are handled.
+  ZoomMode current_zoom_mode_;
+
+  // Used to create a unique zoom ID for every call to SetZoomlevel().
+  int current_zoom_id_;
+
   DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
 };