| 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 rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100), | 278 rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100), |
| 279 ui::SCALE_FACTOR_100P); | 279 ui::SCALE_FACTOR_100P); |
| 280 rb.AddDataPackFromFile(loader.TakeFile(kResourceFile200), | 280 rb.AddDataPackFromFile(loader.TakeFile(kResourceFile200), |
| 281 ui::SCALE_FACTOR_200P); | 281 ui::SCALE_FACTOR_200P); |
| 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 mojom::WallpaperControllerRequest request) { | 332 mojom::WallpaperControllerRequest request) { |
| 334 mojom::WallpaperController* wallpaper_controller = | 333 mojom::WallpaperController* wallpaper_controller = |
| 335 static_cast<UserWallpaperDelegateMus*>( | 334 static_cast<UserWallpaperDelegateMus*>( |
| 336 Shell::GetInstance()->user_wallpaper_delegate()); | 335 Shell::GetInstance()->user_wallpaper_delegate()); |
| 337 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, | 336 wallpaper_controller_bindings_.AddBinding(wallpaper_controller, |
| 338 std::move(request)); | 337 std::move(request)); |
| 339 } | 338 } |
| 340 | 339 |
| 341 } // namespace sysui | 340 } // namespace sysui |
| 342 } // namespace ash | 341 } // namespace ash |
| OLD | NEW |