Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Side by Side Diff: ash/mus/window_manager_application.cc

Issue 2350543002: chromeos; Remove unused switch --dbus-unstub-clients / --dbus-real-clients (Closed)
Patch Set: rebase again Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 13 matching lines...) Expand all
24 #include "services/ui/public/cpp/window_tree_client.h" 24 #include "services/ui/public/cpp/window_tree_client.h"
25 #include "ui/aura/env.h" 25 #include "ui/aura/env.h"
26 #include "ui/events/event.h" 26 #include "ui/events/event.h"
27 #include "ui/message_center/message_center.h" 27 #include "ui/message_center/message_center.h"
28 #include "ui/views/mus/aura_init.h" 28 #include "ui/views/mus/aura_init.h"
29 #include "ui/views/mus/surface_context_factory.h" 29 #include "ui/views/mus/surface_context_factory.h"
30 30
31 #if defined(OS_CHROMEOS) 31 #if defined(OS_CHROMEOS)
32 #include "ash/common/system/chromeos/power/power_status.h" 32 #include "ash/common/system/chromeos/power/power_status.h"
33 #include "chromeos/audio/cras_audio_handler.h" 33 #include "chromeos/audio/cras_audio_handler.h"
34 #include "chromeos/dbus/dbus_client_types.h"
35 #include "chromeos/dbus/dbus_thread_manager.h" 34 #include "chromeos/dbus/dbus_thread_manager.h"
36 #include "chromeos/system/fake_statistics_provider.h" 35 #include "chromeos/system/fake_statistics_provider.h"
37 #include "device/bluetooth/dbus/bluez_dbus_manager.h" // nogncheck 36 #include "device/bluetooth/dbus/bluez_dbus_manager.h" // nogncheck
38 #endif 37 #endif
39 38
40 namespace ash { 39 namespace ash {
41 namespace mus { 40 namespace mus {
42 namespace { 41 namespace {
43 42
44 void InitializeComponents() { 43 void InitializeComponents() {
45 message_center::MessageCenter::Initialize(); 44 message_center::MessageCenter::Initialize();
46 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
47 // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but 46 // Must occur after mojo::ApplicationRunner has initialized AtExitManager, but
48 // before WindowManager::Init(). 47 // before WindowManager::Init().
49 chromeos::DBusThreadManager::Initialize( 48 chromeos::DBusThreadManager::Initialize(
50 chromeos::DBusThreadManager::PROCESS_ASH); 49 chromeos::DBusThreadManager::PROCESS_ASH);
51 50
52 // See ChromeBrowserMainPartsChromeos for ordering details. 51 // See ChromeBrowserMainPartsChromeos for ordering details.
53 bluez::BluezDBusManager::Initialize( 52 bluez::BluezDBusManager::Initialize(
54 chromeos::DBusThreadManager::Get()->GetSystemBus(), 53 chromeos::DBusThreadManager::Get()->GetSystemBus(),
55 chromeos::DBusThreadManager::Get()->IsUsingFake( 54 chromeos::DBusThreadManager::Get()->IsUsingFakes());
56 chromeos::DBusClientType::BLUETOOTH));
57 // TODO(jamescook): Initialize real audio handler. 55 // TODO(jamescook): Initialize real audio handler.
58 chromeos::CrasAudioHandler::InitializeForTesting(); 56 chromeos::CrasAudioHandler::InitializeForTesting();
59 PowerStatus::Initialize(); 57 PowerStatus::Initialize();
60 #endif 58 #endif
61 } 59 }
62 60
63 void ShutdownComponents() { 61 void ShutdownComponents() {
64 #if defined(OS_CHROMEOS) 62 #if defined(OS_CHROMEOS)
65 PowerStatus::Shutdown(); 63 PowerStatus::Shutdown();
66 chromeos::CrasAudioHandler::Shutdown(); 64 chromeos::CrasAudioHandler::Shutdown();
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed, 200 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
203 base::Unretained(this)))); 201 base::Unretained(this))));
204 } 202 }
205 203
206 void WindowManagerApplication::ScreenlockStateChanged(bool locked) { 204 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
207 window_manager_->SetScreenLocked(locked); 205 window_manager_->SetScreenLocked(locked);
208 } 206 }
209 207
210 } // namespace mus 208 } // namespace mus
211 } // namespace ash 209 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698