components/mus/public/interfaces View => Window

components/web_view/frame_connection.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/frame_connection.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "components/clipboard/public/interfaces/clipboard.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
-#include "components/mus/public/interfaces/view_tree_host.mojom.h"
+#include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/resource_provider/public/interfaces/resource_provider.mojom.h"
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/frame_utils.h"
 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.mojom.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
 #include "components/font_service/public/interfaces/font_service.mojom.h"
 #endif
 
 namespace web_view {
 namespace {
 
 // Callback from when the content handler id is obtained.
 void OnGotContentHandlerForFrame(
     const uint32_t existing_content_handler_id,
     const FrameTreeDelegate::CanNavigateFrameCallback& callback,
     scoped_ptr<FrameConnection> connection) {
-  mojo::ViewTreeClientPtr view_tree_client;
+  mus::mojom::WindowTreeClientPtr window_tree_client;
   if (!AreAppIdsEqual(existing_content_handler_id,
                       connection->GetContentHandlerID())) {
-    view_tree_client = connection->GetViewTreeClient();
+    window_tree_client = connection->GetWindowTreeClient();
   }
   FrameConnection* connection_ptr = connection.get();
   callback.Run(connection_ptr->GetContentHandlerID(),
                connection_ptr->frame_client(), connection.Pass(),
-               view_tree_client.Pass());
+               window_tree_client.Pass());
 }
 
 }  // namespace
 
 FrameConnection::FrameConnection() : application_connection_(nullptr) {
 }
 
 FrameConnection::~FrameConnection() {
 }
 
@@ skipping 32 matching lines @@
 
   mojo::Array<mojo::String> clipboard_interfaces;
   clipboard_interfaces.push_back(mojo::Clipboard::Name_);
   filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass());
 
   mojo::Array<mojo::String> tracing_interfaces;
   tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_);
   filter->filter.insert("mojo:tracing", tracing_interfaces.Pass());
 
   mojo::Array<mojo::String> view_manager_interfaces;
-  view_manager_interfaces.push_back(mojo::Gpu::Name_);
-  view_manager_interfaces.push_back(mojo::ViewTreeHostFactory::Name_);
+  view_manager_interfaces.push_back(mus::mojom::Gpu::Name_);
+  view_manager_interfaces.push_back(mus::mojom::WindowTreeHostFactory::Name_);
   filter->filter.insert("mojo:mus", view_manager_interfaces.Pass());
 
   mojo::Array<mojo::String> test_runner_interfaces;
   test_runner_interfaces.push_back(LayoutTestRunner::Name_);
   filter->filter.insert("mojo:web_view_test_runner",
                         test_runner_interfaces.Pass());
 
 #if defined(OS_LINUX) && !defined(OS_ANDROID)
   mojo::Array<mojo::String> font_service_interfaces;
   font_service_interfaces.push_back(font_service::FontService::Name_);
   filter->filter.insert("mojo:font_service", font_service_interfaces.Pass());
 #endif
 
   application_connection_ = app->ConnectToApplicationWithCapabilityFilter(
       request.Pass(), filter.Pass());
   application_connection_->ConnectToService(&frame_client_);
   application_connection_->AddContentHandlerIDCallback(on_got_id_callback);
 }
 
-mojo::ViewTreeClientPtr FrameConnection::GetViewTreeClient() {
+mus::mojom::WindowTreeClientPtr FrameConnection::GetWindowTreeClient() {
   DCHECK(application_connection_);
-  mojo::ViewTreeClientPtr view_tree_client;
-  application_connection_->ConnectToService(&view_tree_client);
-  return view_tree_client.Pass();
+  mus::mojom::WindowTreeClientPtr window_tree_client;
+  application_connection_->ConnectToService(&window_tree_client);
+  return window_tree_client.Pass();
 }
 
 uint32_t FrameConnection::GetContentHandlerID() const {
   uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID;
   if (!application_connection_->GetContentHandlerID(&content_handler_id))
     NOTREACHED();
   return content_handler_id;
 }
 
 }  // namespace web_view