| 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/sysui/sysui_application.h" | 5 #include "ash/sysui/sysui_application.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 #endif | 278 #endif |
| 279 gfx::ImageSkia wallpaper = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); | 279 gfx::ImageSkia wallpaper = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); |
| 280 Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage( | 280 Shell::GetInstance()->desktop_background_controller()->SetWallpaperImage( |
| 281 wallpaper, wallpaper::WALLPAPER_LAYOUT_TILE); | 281 wallpaper, wallpaper::WALLPAPER_LAYOUT_TILE); |
| 282 } | 282 } |
| 283 | 283 |
| 284 void InitializeComponents() { | 284 void InitializeComponents() { |
| 285 message_center::MessageCenter::Initialize(); | 285 message_center::MessageCenter::Initialize(); |
| 286 | 286 |
| 287 #if defined(OS_CHROMEOS) | 287 #if defined(OS_CHROMEOS) |
| 288 ui::DeviceDataManager::CreateInstance(); | |
| 289 chromeos::DBusThreadManager::Initialize(); | 288 chromeos::DBusThreadManager::Initialize(); |
| 290 bluez::BluezDBusManager::Initialize( | 289 bluez::BluezDBusManager::Initialize( |
| 291 chromeos::DBusThreadManager::Get()->GetSystemBus(), | 290 chromeos::DBusThreadManager::Get()->GetSystemBus(), |
| 292 chromeos::DBusThreadManager::Get()->IsUsingStub( | 291 chromeos::DBusThreadManager::Get()->IsUsingStub( |
| 293 chromeos::DBusClientBundle::BLUETOOTH)); | 292 chromeos::DBusClientBundle::BLUETOOTH)); |
| 294 chromeos::CrasAudioHandler::InitializeForTesting(); | 293 chromeos::CrasAudioHandler::InitializeForTesting(); |
| 295 #endif | 294 #endif |
| 296 } | 295 } |
| 297 | 296 |
| 298 private: | 297 private: |
| (...skipping 24 matching lines...) Expand all Loading... |
| 323 void SysUIApplication::Create( | 322 void SysUIApplication::Create( |
| 324 ::shell::Connection* connection, | 323 ::shell::Connection* connection, |
| 325 mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) { | 324 mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) { |
| 326 mash::shelf::mojom::ShelfController* shelf_controller = | 325 mash::shelf::mojom::ShelfController* shelf_controller = |
| 327 static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate()); | 326 static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate()); |
| 328 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request)); | 327 shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request)); |
| 329 } | 328 } |
| 330 | 329 |
| 331 } // namespace sysui | 330 } // namespace sysui |
| 332 } // namespace ash | 331 } // namespace ash |
| OLD | NEW |