Mandoline webview: View => Window

components/web_view/web_view_impl.cc

 // Copyright 2015 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 "components/web_view/web_view_impl.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 46 matching lines @@
 WebViewImpl::~WebViewImpl() {
   if (content_)
     content_->RemoveObserver(this);
   if (root_) {
     root_->RemoveObserver(this);
     mus::ScopedWindowPtr::DeleteWindowOrWindowManager(root_);
   }
 }
 
 void WebViewImpl::OnLoad(const GURL& pending_url) {
-  // Frames are uniqued based on the id of the associated View. By creating a
-  // new View each time through we ensure the renderers get a clean id, rather
+  // Frames are uniqued based on the id of the associated Window. By creating a
+  // new Window each time through we ensure the renderers get a clean id, rather
   // than one they may know about and try to incorrectly use.
   if (content_) {
     content_->Destroy();
     DCHECK(!content_);
   }
 
   client_->TopLevelNavigationStarted(pending_url.spec());
 
   content_ = root_->connection()->NewWindow();
   content_->SetBounds(*mojo::Rect::From(
@@ skipping 78 matching lines @@
 
   if (pending_load_ && pending_load_->is_content_handler_id_valid())
     OnLoad(pending_load_->pending_url());
 }
 
 void WebViewImpl::OnConnectionLost(mus::WindowTreeConnection* connection) {
   root_ = nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// WebViewImpl, mus::ViewObserver implementation:
+// WebViewImpl, mus::WindowObserver implementation:
 
-void WebViewImpl::OnWindowBoundsChanged(mus::Window* view,
+void WebViewImpl::OnWindowBoundsChanged(mus::Window* window,
                                         const mojo::Rect& old_bounds,
                                         const mojo::Rect& new_bounds) {
-  if (view != content_) {
+  if (window != content_) {
     mojo::Rect rect;
     rect.width = new_bounds.width;
     rect.height = new_bounds.height;
     if (content_)
       content_->SetBounds(rect);
   }
 }
 
-void WebViewImpl::OnWindowDestroyed(mus::Window* view) {
-  // |FrameTree| cannot outlive the content view.
-  if (view == content_) {
+void WebViewImpl::OnWindowDestroyed(mus::Window* window) {
+  // |FrameTree| cannot outlive the content window.
+  if (window == content_) {
     frame_tree_.reset();
     content_ = nullptr;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, FrameTreeDelegate implementation:
 
 scoped_ptr<FrameUserData> WebViewImpl::CreateUserDataForNewFrame(
     mojom::FrameClientPtr frame_client) {
@@ skipping 91 matching lines @@
   std::vector<Frame*> all_frames;
   PreOrderDepthFirstTraverseTree(frame_tree_->root(), &all_frames);
   return all_frames;
 }
 
 mojom::WebViewClient* WebViewImpl::GetWebViewClient() {
   return client_.get();
 }
 
 }  // namespace web_view