Move ZoomController out of ChromeWebViewGuestDelegate.

extensions/browser/guest_view/guest_view_base.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_GUEST_VIEW_BASE_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 
 #include <queue>
 
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
+#include "components/ui/zoom/zoom_observer.h"
 #include "content/public/browser/browser_plugin_guest_delegate.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
 
 struct RendererContentSettingRules;
 
 namespace extensions {
 
 // A GuestViewBase is the base class browser-side API implementation for a
 // <*view> tag. GuestViewBase maintains an association between a guest
 // WebContents and an owner WebContents. It receives events issued from
 // the guest and relays them to the owner. GuestViewBase tracks the lifetime
 // of its owner. A GuestViewBase's owner is referred to as an embedder if
 // it is attached to a container within the owner's WebContents.
 class GuestViewBase : public content::BrowserPluginGuestDelegate,
                       public content::WebContentsDelegate,
-                      public content::WebContentsObserver {
+                      public content::WebContentsObserver,
+                      public ui_zoom::ZoomObserver {
  public:
   class Event {
    public:
     Event(const std::string& name, scoped_ptr<base::DictionaryValue> args);
     ~Event();
 
     const std::string& name() const { return name_; }
 
     scoped_ptr<base::DictionaryValue> GetArguments();
 
@@ skipping 45 matching lines @@
   virtual void DidInitialize() {}
 
   // This method is called when the initial set of frames within the page have
   // completed loading.
   virtual void DidStopLoading() {}
 
   // This method is called before the embedder is destroyed.
   // |owner_web_contents_| should still be valid during this call. This
   // allows the derived class to perform some cleanup related to the embedder
   // web contents.
-  virtual void EmbedderWillBeDestroyed() {}
+  virtual void EmbedderWillBeDestroyed();

[Fady Samuel, 2014/12/09 20:09:46]

This method is meant to be overriden by derived classes which means you'll lose
the code in GuestViewBase::EmbedderWillBeDestroyed.

I would not implement this here. Instead, I'd create a new private method:
perhaps OwnerWebContentsWillBeDestroyed(), do your cleanup work there and then
call EmbedderWillBeDestroyed() at the end.

[wjmaclean, 2014/12/09 20:50:04]

Done.

 
   // This method is called when the guest WebContents has been destroyed. This
   // object will be destroyed after this call returns.
   //
   // This gives the derived class an opportunity to perform some cleanup.
   virtual void GuestDestroyed() {}
 
   // This method is invoked when the guest RenderView is ready, e.g. because we
   // recreated it after a crash or after reattachment.
   //
@@ skipping 134 matching lines @@
   void ElementSizeChanged(const gfx::Size& old_size,
                           const gfx::Size& new_size) final;
   content::WebContents* GetOwnerWebContents() const final;
   void GuestSizeChanged(const gfx::Size& old_size,
                         const gfx::Size& new_size) final;
   void RegisterDestructionCallback(const DestructionCallback& callback) final;
   void WillAttach(content::WebContents* embedder_web_contents,
                   int browser_plugin_instance_id,
                   bool is_full_page_plugin) final;
 
+  // ui_zoom::ZoomObserver implementation.
+  void OnZoomChanged(
+      const ui_zoom::ZoomController::ZoomChangedEventData& data) override;
+
   // Dispatches an event |event_name| to the embedder with the |event| fields.
   void DispatchEventToEmbedder(Event* event);
 
  protected:
   GuestViewBase(content::BrowserContext* browser_context,
                 content::WebContents* owner_web_contents,
                 int guest_instance_id);
 
   ~GuestViewBase() override;
 
@@ skipping 97 matching lines @@
   // This is used to ensure pending tasks will not fire after this object is
   // destroyed.
   base::WeakPtrFactory<GuestViewBase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewBase);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_