| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mash/wm/window_manager_application.h" | 5 #include "mash/wm/window_manager_application.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 } | 55 } |
| 56 | 56 |
| 57 void WindowManagerApplication::OnRootWindowControllerGotRoot( | 57 void WindowManagerApplication::OnRootWindowControllerGotRoot( |
| 58 RootWindowController* root_controller) { | 58 RootWindowController* root_controller) { |
| 59 if (globals_) | 59 if (globals_) |
| 60 return; // |root_controller| is the > 1 root, nothing to do. | 60 return; // |root_controller| is the > 1 root, nothing to do. |
| 61 | 61 |
| 62 if (connector_) | 62 if (connector_) |
| 63 aura_init_.reset(new views::AuraInit(connector_, "mash_wm_resources.pak")); | 63 aura_init_.reset(new views::AuraInit(connector_, "mash_wm_resources.pak")); |
| 64 | 64 |
| 65 globals_.reset(new WmGlobalsMus(root_controller->root()->connection())); | 65 globals_.reset(new WmGlobalsMus(root_controller->root()->window_tree())); |
| 66 lookup_.reset(new WmLookupMus); | 66 lookup_.reset(new WmLookupMus); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void WindowManagerApplication::OnRootWindowControllerDoneInit( | 69 void WindowManagerApplication::OnRootWindowControllerDoneInit( |
| 70 RootWindowController* root_controller) { | 70 RootWindowController* root_controller) { |
| 71 if (!screen_) { | 71 if (!screen_) { |
| 72 std::unique_ptr<views::ScreenMus> screen(new views::ScreenMus(nullptr)); | 72 std::unique_ptr<views::ScreenMus> screen(new views::ScreenMus(nullptr)); |
| 73 screen->Init(connector_); | 73 screen->Init(connector_); |
| 74 screen_ = std::move(screen); | 74 screen_ = std::move(screen); |
| 75 } | 75 } |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 | 198 |
| 199 void WindowManagerApplication::CreateWindowManager( | 199 void WindowManagerApplication::CreateWindowManager( |
| 200 mus::mojom::DisplayPtr display, | 200 mus::mojom::DisplayPtr display, |
| 201 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) { | 201 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) { |
| 202 AddRootWindowController(RootWindowController::CreateFromDisplay( | 202 AddRootWindowController(RootWindowController::CreateFromDisplay( |
| 203 this, std::move(display), std::move(client_request))); | 203 this, std::move(display), std::move(client_request))); |
| 204 } | 204 } |
| 205 | 205 |
| 206 } // namespace wm | 206 } // namespace wm |
| 207 } // namespace mash | 207 } // namespace mash |
| OLD | NEW |