OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/mus/sysui_application.h" | 5 #include "ash/mus/sysui_application.h" |
6 | 6 |
7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
8 #include "ash/host/ash_window_tree_host_init_params.h" | 8 #include "ash/host/ash_window_tree_host_init_params.h" |
9 #include "ash/host/ash_window_tree_host_platform.h" | 9 #include "ash/host/ash_window_tree_host_platform.h" |
10 #include "ash/mus/keyboard_ui_mus.h" | 10 #include "ash/mus/keyboard_ui_mus.h" |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 | 249 |
250 DISALLOW_COPY_AND_ASSIGN(AshInit); | 250 DISALLOW_COPY_AND_ASSIGN(AshInit); |
251 }; | 251 }; |
252 | 252 |
253 SysUIApplication::SysUIApplication() {} | 253 SysUIApplication::SysUIApplication() {} |
254 | 254 |
255 SysUIApplication::~SysUIApplication() {} | 255 SysUIApplication::~SysUIApplication() {} |
256 | 256 |
257 void SysUIApplication::Initialize(mojo::Shell* shell, | 257 void SysUIApplication::Initialize(mojo::Shell* shell, |
258 const std::string& url, | 258 const std::string& url, |
259 uint32_t id) { | 259 uint32_t id, |
| 260 uint32_t user_id) { |
260 ash_init_.reset(new AshInit()); | 261 ash_init_.reset(new AshInit()); |
261 ash_init_->Initialize(shell); | 262 ash_init_->Initialize(shell); |
262 } | 263 } |
263 | 264 |
264 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) { | 265 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) { |
265 return true; | 266 return true; |
266 } | 267 } |
267 | 268 |
268 } // namespace sysui | 269 } // namespace sysui |
269 } // namespace ash | 270 } // namespace ash |
OLD | NEW |