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 "ash/mus/window_manager_application.h" | 5 #include "ash/mus/window_manager_application.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/material_design/material_design_controller.h" | 9 #include "ash/common/material_design/material_design_controller.h" |
10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 namespace ash { | 40 namespace ash { |
41 namespace mus { | 41 namespace mus { |
42 namespace { | 42 namespace { |
43 | 43 |
44 void InitializeComponents() { | 44 void InitializeComponents() { |
45 message_center::MessageCenter::Initialize(); | 45 message_center::MessageCenter::Initialize(); |
46 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
47 // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but | 47 // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but |
48 // before WindowManager::Init(). | 48 // before WindowManager::Init(). |
49 chromeos::DBusThreadManager::Initialize(); | 49 chromeos::DBusThreadManager::Initialize( |
| 50 chromeos::DBusThreadManager::PROCESS_ASH); |
50 | 51 |
51 // See ChromeBrowserMainPartsChromeos for ordering details. | 52 // See ChromeBrowserMainPartsChromeos for ordering details. |
52 bluez::BluezDBusManager::Initialize( | 53 bluez::BluezDBusManager::Initialize( |
53 chromeos::DBusThreadManager::Get()->GetSystemBus(), | 54 chromeos::DBusThreadManager::Get()->GetSystemBus(), |
54 chromeos::DBusThreadManager::Get()->IsUsingFake( | 55 chromeos::DBusThreadManager::Get()->IsUsingFake( |
55 chromeos::DBusClientType::BLUETOOTH)); | 56 chromeos::DBusClientType::BLUETOOTH)); |
56 // TODO(jamescook): Initialize real audio handler. | 57 // TODO(jamescook): Initialize real audio handler. |
57 chromeos::CrasAudioHandler::InitializeForTesting(); | 58 chromeos::CrasAudioHandler::InitializeForTesting(); |
58 PowerStatus::Initialize(); | 59 PowerStatus::Initialize(); |
59 #endif | 60 #endif |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed, | 202 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed, |
202 base::Unretained(this)))); | 203 base::Unretained(this)))); |
203 } | 204 } |
204 | 205 |
205 void WindowManagerApplication::ScreenlockStateChanged(bool locked) { | 206 void WindowManagerApplication::ScreenlockStateChanged(bool locked) { |
206 window_manager_->SetScreenLocked(locked); | 207 window_manager_->SetScreenLocked(locked); |
207 } | 208 } |
208 | 209 |
209 } // namespace mus | 210 } // namespace mus |
210 } // namespace ash | 211 } // namespace ash |
OLD | NEW |