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

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

Issue 2611773002: Removes code using mus client lib (Closed)
Patch Set: dont run on linux Created 3 years, 11 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/touch_hud/mus/touch_hud_application.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/mojo_interface_factory.h" 10 #include "ash/common/mojo_interface_factory.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/mus/window_manager.h" 12 #include "ash/mus/window_manager.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/threading/thread_task_runner_handle.h" 15 #include "base/threading/thread_task_runner_handle.h"
16 #include "services/service_manager/public/cpp/connection.h" 16 #include "services/service_manager/public/cpp/connection.h"
17 #include "services/service_manager/public/cpp/connector.h" 17 #include "services/service_manager/public/cpp/connector.h"
18 #include "services/service_manager/public/cpp/service_context.h" 18 #include "services/service_manager/public/cpp/service_context.h"
19 #include "services/tracing/public/cpp/provider.h" 19 #include "services/tracing/public/cpp/provider.h"
20 #include "services/ui/common/accelerator_util.h" 20 #include "services/ui/common/accelerator_util.h"
21 #include "services/ui/public/cpp/gpu/gpu.h" 21 #include "services/ui/public/cpp/gpu/gpu.h"
22 #include "ui/aura/env.h" 22 #include "ui/aura/env.h"
23 #include "ui/aura/mus/mus_context_factory.h" 23 #include "ui/aura/mus/mus_context_factory.h"
24 #include "ui/aura/mus/window_tree_client.h" 24 #include "ui/aura/mus/window_tree_client.h"
25 #include "ui/events/event.h" 25 #include "ui/events/event.h"
26 #include "ui/message_center/message_center.h" 26 #include "ui/message_center/message_center.h"
27 #include "ui/views/mus/aura_init.h" 27 #include "ui/views/mus/aura_init.h"
28 #include "ui/views/mus/surface_context_factory.h"
29 28
30 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
31 #include "ash/common/system/chromeos/power/power_status.h" 30 #include "ash/common/system/chromeos/power/power_status.h"
32 #include "ash/mus/network_connect_delegate_mus.h" 31 #include "ash/mus/network_connect_delegate_mus.h"
33 #include "chromeos/audio/cras_audio_handler.h" 32 #include "chromeos/audio/cras_audio_handler.h"
34 #include "chromeos/dbus/dbus_thread_manager.h" 33 #include "chromeos/dbus/dbus_thread_manager.h"
35 #include "chromeos/network/network_connect.h" 34 #include "chromeos/network/network_connect.h"
36 #include "chromeos/network/network_handler.h" 35 #include "chromeos/network/network_handler.h"
37 #include "chromeos/system/fake_statistics_provider.h" 36 #include "chromeos/system/fake_statistics_provider.h"
38 #include "device/bluetooth/dbus/bluez_dbus_manager.h" // nogncheck 37 #include "device/bluetooth/dbus/bluez_dbus_manager.h" // nogncheck
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 const service_manager::ServiceInfo& remote_info, 148 const service_manager::ServiceInfo& remote_info,
150 service_manager::InterfaceRegistry* registry) { 149 service_manager::InterfaceRegistry* registry) {
151 // Register services used in both classic ash and mash. 150 // Register services used in both classic ash and mash.
152 mojo_interface_factory::RegisterInterfaces( 151 mojo_interface_factory::RegisterInterfaces(
153 registry, base::ThreadTaskRunnerHandle::Get()); 152 registry, base::ThreadTaskRunnerHandle::Get());
154 return true; 153 return true;
155 } 154 }
156 155
157 } // namespace mus 156 } // namespace mus
158 } // namespace ash 157 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/touch_hud/mus/touch_hud_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698