Move ZoomController out of ChromeWebViewGuestDelegate.

extensions/browser/guest_view/guest_view_base.cc

 // 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.
 
 #include "extensions/browser/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/ui/zoom/zoom_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/app_view/app_view_guest.h"
@@ skipping 183 matching lines @@
   owner_lifetime_observer_.reset(
       new OwnerLifetimeObserver(this, owner_web_contents_));
 
   WebContentsObserver::Observe(guest_web_contents);
   guest_web_contents->SetDelegate(this);
   webcontents_guestview_map.Get().insert(
       std::make_pair(guest_web_contents, this));
   GuestViewManager::FromBrowserContext(browser_context_)->
       AddGuest(guest_instance_id_, guest_web_contents);
 
+  // Create a zoom controller for the guest contents give it access to
+  // GetZoomLevel() and and SetZoomLevel() in WebViewGuest.

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

This comment is no longer correct as this code lives in GuestViewBase. I'd
simply remove it and add a brief comment about what functionality ZoomController
provides.

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

Done.

+  // TODO(wjmaclean): Verify that |guest_web_contents| is the right value to
+  // pass here.

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

This looks right to me.

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

Acknowledged.

+  ui_zoom::ZoomController::CreateForWebContents(guest_web_contents);
+
   // Give the derived class an opportunity to perform additional initialization.
   DidInitialize();
 }
 
 void GuestViewBase::SetAutoSize(bool enabled,
                                 const gfx::Size& min_size,
                                 const gfx::Size& max_size) {
   min_auto_size_ = min_size;
   min_auto_size_.SetToMin(max_size);
   max_auto_size_ = max_size;
@@ skipping 69 matching lines @@
     return NULL;
 
   return GuestViewBase::FromWebContents(guest_web_contents);
 }
 
 // static
 bool GuestViewBase::IsGuest(WebContents* web_contents) {
   return !!GuestViewBase::FromWebContents(web_contents);
 }
 
+void GuestViewBase::EmbedderWillBeDestroyed() {
+  ui_zoom::ZoomController* zoom_controller =
+      ui_zoom::ZoomController::FromWebContents(embedder_web_contents());
+  if (!zoom_controller)
+    return;
+  zoom_controller->RemoveObserver(this);
+}
+
 bool GuestViewBase::IsAutoSizeSupported() const {
   return false;
 }
 
 bool GuestViewBase::IsDragAndDropEnabled() const {
   return false;
 }
 
 void GuestViewBase::DidAttach(int guest_proxy_routing_id) {
   opener_lifetime_observer_.reset();
 
+  // Any zoom events from the embedder should be relayed to the guest.
+  ui_zoom::ZoomController* zoom_controller =
+      ui_zoom::ZoomController::FromWebContents(embedder_web_contents());
+  if (zoom_controller) {
+    // Listen to the embedder's zoom changes.
+    zoom_controller->AddObserver(this);
+    // Set the guest's initial zoom level to be equal to the embedder's.
+    ui_zoom::ZoomController::FromWebContents(web_contents())
+        ->SetZoomLevel(zoom_controller->GetZoomLevel());
+  }
+
   // Give the derived class an opportunity to perform some actions.
   DidAttachToEmbedder();
 
   // Inform the associated GuestViewContainer that the contentWindow is ready.
   embedder_web_contents()->Send(new ExtensionMsg_GuestAttached(
       embedder_web_contents()->GetMainFrame()->GetRoutingID(),
       element_instance_id_,
       guest_proxy_routing_id));
 
   SendQueuedEvents();
@@ skipping 156 matching lines @@
 bool GuestViewBase::PreHandleGestureEvent(content::WebContents* source,
                                          const blink::WebGestureEvent& event) {
   return event.type == blink::WebGestureEvent::GesturePinchBegin ||
       event.type == blink::WebGestureEvent::GesturePinchUpdate ||
       event.type == blink::WebGestureEvent::GesturePinchEnd;
 }
 
 GuestViewBase::~GuestViewBase() {
 }
 
+void GuestViewBase::OnZoomChanged(
+    const ui_zoom::ZoomController::ZoomChangedEventData& data) {
+  ui_zoom::ZoomController::FromWebContents(web_contents())

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

It would be nice to add a comment here that updating the embedder's zoom level
updates the guest's zoom level.

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

Done.

+      ->SetZoomLevel(data.new_zoom_level);
+}
+
 void GuestViewBase::DispatchEventToEmbedder(Event* event) {
   scoped_ptr<Event> event_ptr(event);
 
   if (!attached()) {
     pending_events_.push_back(linked_ptr<Event>(event_ptr.release()));
     return;
   }
 
   EventFilteringInfo info;
   info.SetInstanceID(view_instance_id_);
@@ skipping 36 matching lines @@
 
 // static
 void GuestViewBase::RegisterGuestViewTypes() {
   AppViewGuest::Register();
   ExtensionOptionsGuest::Register();
   MimeHandlerViewGuest::Register();
   WebViewGuest::Register();
 }
 
 }  // namespace extensions