| 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 | 272 |
| 273 DISALLOW_COPY_AND_ASSIGN(AshInit); | 273 DISALLOW_COPY_AND_ASSIGN(AshInit); |
| 274 }; | 274 }; |
| 275 | 275 |
| 276 SysUIApplication::SysUIApplication() {} | 276 SysUIApplication::SysUIApplication() {} |
| 277 | 277 |
| 278 SysUIApplication::~SysUIApplication() {} | 278 SysUIApplication::~SysUIApplication() {} |
| 279 | 279 |
| 280 void SysUIApplication::Initialize(mojo::Connector* connector, | 280 void SysUIApplication::Initialize(mojo::Connector* connector, |
| 281 const std::string& url, | 281 const std::string& url, |
| 282 uint32_t id, | 282 const std::string& user_id, |
| 283 uint32_t user_id) { | 283 uint32_t id) { |
| 284 ash_init_.reset(new AshInit()); | 284 ash_init_.reset(new AshInit()); |
| 285 ash_init_->Initialize(connector); | 285 ash_init_->Initialize(connector); |
| 286 } | 286 } |
| 287 | 287 |
| 288 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) { | 288 bool SysUIApplication::AcceptConnection(mojo::Connection* connection) { |
| 289 return true; | 289 return true; |
| 290 } | 290 } |
| 291 | 291 |
| 292 } // namespace sysui | 292 } // namespace sysui |
| 293 } // namespace ash | 293 } // namespace ash |
| OLD | NEW |