components/mus/public/interfaces 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 66 matching lines @@
   content_ = root_->connection()->CreateWindow();
   content_->SetBounds(*mojo::Rect::From(
       gfx::Rect(0, 0, root_->bounds().width, root_->bounds().height)));
   root_->AddChild(content_);
   content_->SetVisible(true);
   content_->AddObserver(this);
 
   scoped_ptr<PendingWebViewLoad> pending_load(pending_load_.Pass());
   scoped_ptr<FrameConnection> frame_connection(
       pending_load->frame_connection());
-  mojo::ViewTreeClientPtr view_tree_client =
-      frame_connection->GetViewTreeClient();
+  mus::mojom::WindowTreeClientPtr window_tree_client =
+      frame_connection->GetWindowTreeClient();
 
   Frame::ClientPropertyMap client_properties;
   if (devtools_agent_) {
     devtools_service::DevToolsAgentPtr forward_agent;
     frame_connection->application_connection()->ConnectToService(
         &forward_agent);
     devtools_agent_->AttachFrame(forward_agent.Pass(), &client_properties);
   }
 
   mojom::FrameClient* frame_client = frame_connection->frame_client();
   const uint32_t content_handler_id = frame_connection->GetContentHandlerID();
   frame_tree_.reset(new FrameTree(content_handler_id, content_,
-                                  view_tree_client.Pass(), this, frame_client,
+                                  window_tree_client.Pass(), this, frame_client,
                                   frame_connection.Pass(), client_properties,
                                   pending_load->navigation_start_time()));
 }
 
 void WebViewImpl::PreOrderDepthFirstTraverseTree(Frame* node,
                                                  std::vector<Frame*>* output) {
   output->push_back(node);
   for (Frame* child : node->children())
     PreOrderDepthFirstTraverseTree(child, output);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, WebView implementation:
 
 void WebViewImpl::LoadRequest(mojo::URLRequestPtr request) {
   navigation_controller_.LoadURL(request.Pass());
 }
 
-void WebViewImpl::GetViewTreeClient(
-    mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client) {
+void WebViewImpl::GetWindowTreeClient(
+    mojo::InterfaceRequest<mus::mojom::WindowTreeClient> window_tree_client) {
   mus::WindowTreeConnection::Create(
-      this, view_tree_client.Pass(),
+      this, window_tree_client.Pass(),
       mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
 }
 
 void WebViewImpl::Find(const mojo::String& search_text,
                        bool forward_direction) {
   find_controller_.Find(search_text.To<std::string>(), forward_direction);
 }
 
 void WebViewImpl::StopFinding() {
   find_controller_.StopFinding();
@@ skipping 151 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