[Extensions] Remove ExtensionFunction usage of RenderViewHost

extensions/browser/guest_view/web_view/web_view_guest.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/web_view/web_view_guest.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 423 matching lines @@
 }
 
 void WebViewGuest::EmbedderFullscreenToggled(bool entered_fullscreen) {
   is_embedder_fullscreen_ = entered_fullscreen;
   // If the embedder has got out of fullscreen, we get out of fullscreen
   // mode as well.
   if (!entered_fullscreen)
     SetFullscreenState(false);
 }
 
+bool WebViewGuest::ZoomPropagatesFromEmbedderToGuest() const {
+  // We use the embedder's zoom iff we haven't set a zoom ourselves using
+  // e.g. webview.setZoom().
+  return !did_set_explicit_zoom_;

[wjmaclean, 2016/08/11 13:30:03]

This part of the CL seems a bit orthogonal to removing the reference to
RenderViewHost, though I suppose it's necessary to prevent the new pathway
through WebContents from stomping on the guest's zoom level if it was set
separately, is that right?

[Devlin, 2016/08/11 15:21:10]

Yep. Before AppWindows didn't have a ZoomController created, so we early-outed
in GuestViewBase.  Now that they have one, we need to make sure that we don't
track the embedder's zoom (e.g. when navigation commits or when the embedder
zoom adjusts).  It seems like this was the desired behavior all along, and that
previously we just lucked out by there not being a zoom controller in the
embedder.

+}
+
 const char* WebViewGuest::GetAPINamespace() const {
   return webview::kAPINamespace;
 }
 
 int WebViewGuest::GetTaskPrefix() const {
   return IDS_EXTENSION_TASK_MANAGER_WEBVIEW_TAG_PREFIX;
 }
 
 void WebViewGuest::GuestDestroyed() {
   RemoveWebViewStateFromIOThread(web_contents());
@@ skipping 320 matching lines @@
       rules_registry_id_(RulesRegistryService::kInvalidRulesRegistryID),
       find_helper_(this),
       is_overriding_user_agent_(false),
       allow_transparency_(false),
       javascript_dialog_helper_(this),
       allow_scaling_(false),
       is_guest_fullscreen_(false),
       is_embedder_fullscreen_(false),
       last_fullscreen_permission_was_allowed_by_embedder_(false),
       pending_zoom_factor_(0.0),
+      did_set_explicit_zoom_(false),
       weak_ptr_factory_(this) {
   web_view_guest_delegate_.reset(
       ExtensionsAPIClient::Get()->CreateWebViewGuestDelegate(this));
 }
 
 WebViewGuest::~WebViewGuest() {
 }
 
 void WebViewGuest::DidCommitProvisionalLoadForFrame(
     content::RenderFrameHost* render_frame_host,
@@ skipping 354 matching lines @@
 
 void WebViewGuest::SetName(const std::string& name) {
   if (name_ == name)
     return;
   name_ = name;
 
   Send(new ExtensionMsg_SetFrameName(routing_id(), name_));
 }
 
 void WebViewGuest::SetZoom(double zoom_factor) {
+  did_set_explicit_zoom_ = true;
   auto* zoom_controller = ZoomController::FromWebContents(web_contents());
   DCHECK(zoom_controller);
   double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
   zoom_controller->SetZoomLevel(zoom_level);
 }
 
 void WebViewGuest::SetZoomMode(ZoomController::ZoomMode zoom_mode) {
   ZoomController::FromWebContents(web_contents())->SetZoomMode(zoom_mode);
 }
 
@@ skipping 331 matching lines @@
     std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue());
     DispatchEventToView(base::WrapUnique(
         new GuestViewEvent(webview::kEventExitFullscreen, std::move(args))));
   }
   // Since we changed fullscreen state, sending a Resize message ensures that
   // renderer/ sees the change.
   web_contents()->GetRenderViewHost()->GetWidget()->WasResized();
 }
 
 }  // namespace extensions