Move ZoomController out of ChromeWebViewGuestDelegate.

extensions/browser/guest_view/web_view/web_view_guest.h

 // Copyright 2014 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 EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 
 #include <vector>
 
 #include "base/observer_list.h"
@@ skipping 157 matching lines @@
   void RequestPointerLockPermission(
       bool user_gesture,
       bool last_unlocked_by_target,
       const base::Callback<void(bool)>& callback) override;
   // NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // Returns the current zoom factor.
-  double GetZoom();
+  double GetZoom() { return current_zoom_factor_; }

[Fady Samuel, 2014/12/09 21:41:42]

Call zoom() const

[wjmaclean, 2014/12/09 22:12:37]

Done.

 
   // Begin or continue a find request.
   void StartFinding(const base::string16& search_text,
                     const blink::WebFindOptions& options,
                     scoped_refptr<WebViewInternalFindFunction> find_function);
 
   // Conclude a find request to clear highlighting.
   void StopFinding(content::StopFindAction);
 
   // If possible, navigate the guest to |relative_index| entries away from the
@@ skipping 173 matching lines @@
     bool changed;
     NewWindowInfo(const GURL& url, const std::string& name) :
         url(url),
         name(name),
         changed(false) {}
   };
 
   typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap;
   PendingWindowMap pending_new_windows_;
 
+  // Stores the current zoom factor.
+  double current_zoom_factor_;
+
   // This is used to ensure pending tasks will not fire after this object is
   // destroyed.
   base::WeakPtrFactory<WebViewGuest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_