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 "components/mus/public/cpp/event_matcher.h" | 10 #include "components/mus/public/cpp/event_matcher.h" |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 root_windows_observers_.RemoveObserver(observer); | 98 root_windows_observers_.RemoveObserver(observer); |
99 } | 99 } |
100 | 100 |
101 void WindowManagerApplication::OnAcceleratorRegistrarDestroyed( | 101 void WindowManagerApplication::OnAcceleratorRegistrarDestroyed( |
102 AcceleratorRegistrarImpl* registrar) { | 102 AcceleratorRegistrarImpl* registrar) { |
103 accelerator_registrars_.erase(registrar); | 103 accelerator_registrars_.erase(registrar); |
104 } | 104 } |
105 | 105 |
106 void WindowManagerApplication::Initialize(mojo::Shell* shell, | 106 void WindowManagerApplication::Initialize(mojo::Shell* shell, |
107 const std::string& url, | 107 const std::string& url, |
108 uint32_t id) { | 108 uint32_t id, |
| 109 uint32_t user_id) { |
109 shell_ = shell; | 110 shell_ = shell; |
110 tracing_.Initialize(shell, url); | 111 tracing_.Initialize(shell, url); |
111 | 112 |
112 mus::mojom::WindowManagerFactoryServicePtr wm_factory_service; | 113 mus::mojom::WindowManagerFactoryServicePtr wm_factory_service; |
113 shell_->ConnectToInterface("mojo:mus", &wm_factory_service); | 114 shell_->ConnectToInterface("mojo:mus", &wm_factory_service); |
114 wm_factory_service->SetWindowManagerFactory( | 115 wm_factory_service->SetWindowManagerFactory( |
115 window_manager_factory_binding_.CreateInterfacePtrAndBind()); | 116 window_manager_factory_binding_.CreateInterfacePtrAndBind()); |
116 | 117 |
117 user_window_controller_.reset(new UserWindowControllerImpl()); | 118 user_window_controller_.reset(new UserWindowControllerImpl()); |
118 | 119 |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 | 160 |
160 void WindowManagerApplication::CreateWindowManager( | 161 void WindowManagerApplication::CreateWindowManager( |
161 mus::mojom::DisplayPtr display, | 162 mus::mojom::DisplayPtr display, |
162 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) { | 163 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request) { |
163 root_controllers_.insert(RootWindowController::CreateFromDisplay( | 164 root_controllers_.insert(RootWindowController::CreateFromDisplay( |
164 this, std::move(display), std::move(client_request))); | 165 this, std::move(display), std::move(client_request))); |
165 } | 166 } |
166 | 167 |
167 } // namespace wm | 168 } // namespace wm |
168 } // namespace mash | 169 } // namespace mash |
OLD | NEW |