components/mus/public/interfaces View => Window

ui/views/mus/window_manager_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 "ui/views/mus/window_manager_connection.h"
 
 #include "components/mus/public/cpp/window_tree_connection.h"
-#include "components/mus/public/interfaces/view_tree.mojom.h"
+#include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/network/network_type_converters.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/mus/native_widget_view_manager.h"
 
 namespace mojo {
@@ skipping 59 matching lines @@
   app_->ConnectToService(mojo::URLRequest::From(window_manager_url),
                          &window_manager_);
   aura_init_.reset(new AuraInit(
       app, "example_resources.pak",
       GetDisplaysFromWindowManager(app, &window_manager_)));
 }
 
 WindowManagerConnection::~WindowManagerConnection() {}
 
 mus::Window* WindowManagerConnection::CreateWindow() {
-  mojo::ViewTreeClientPtr view_tree_client;
-  mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client_request =
-      GetProxy(&view_tree_client);
-  window_manager_->OpenWindow(view_tree_client.Pass());
+  mus::mojom::WindowTreeClientPtr window_tree_client;
+  mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
+      window_tree_client_request = GetProxy(&window_tree_client);
+  window_manager_->OpenWindow(window_tree_client.Pass());
   mus::WindowTreeConnection* window_tree_connection =
       mus::WindowTreeConnection::Create(
-          this, view_tree_client_request.Pass(),
+          this, window_tree_client_request.Pass(),
           mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED);
   DCHECK(window_tree_connection->GetRoot());
   return window_tree_connection->GetRoot();
 }
 
 NativeWidget* WindowManagerConnection::CreateNativeWidget(
     internal::NativeWidgetDelegate* delegate) {
   NativeWidgetViewManager* native_widget =
       new NativeWidgetViewManager(delegate, app_->shell(), CreateWindow());
   native_widget->set_window_manager(window_manager_.get());
   return native_widget;
 }
 
 void WindowManagerConnection::OnBeforeWidgetInit(
     Widget::InitParams* params,
     internal::NativeWidgetDelegate* delegate) {}
 
 void WindowManagerConnection::OnEmbed(mus::Window* root) {}
 void WindowManagerConnection::OnConnectionLost(
     mus::WindowTreeConnection* connection) {}
 
 #if defined(OS_WIN)
 HICON WindowManagerConnection::GetSmallWindowIcon() const {
   return nullptr;
 }
 #endif
 
 }  // namespace views