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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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 | « ash/mus/system_tray_delegate_mus.cc ('k') | ash/root_window_controller.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/mojo_interface_factory.h" 9 #include "ash/common/mojo_interface_factory.h"
10 #include "ash/common/system/chromeos/power/power_status.h"
11 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
12 #include "ash/mus/network_connect_delegate_mus.h" 11 #include "ash/mus/network_connect_delegate_mus.h"
13 #include "ash/mus/window_manager.h" 12 #include "ash/mus/window_manager.h"
13 #include "ash/system/power/power_status.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/threading/sequenced_worker_pool.h" 16 #include "base/threading/sequenced_worker_pool.h"
17 #include "base/threading/thread_task_runner_handle.h" 17 #include "base/threading/thread_task_runner_handle.h"
18 #include "chromeos/audio/cras_audio_handler.h" 18 #include "chromeos/audio/cras_audio_handler.h"
19 #include "chromeos/dbus/dbus_thread_manager.h" 19 #include "chromeos/dbus/dbus_thread_manager.h"
20 #include "chromeos/network/network_connect.h" 20 #include "chromeos/network/network_connect.h"
21 #include "chromeos/network/network_handler.h" 21 #include "chromeos/network/network_handler.h"
22 #include "chromeos/system/fake_statistics_provider.h" 22 #include "chromeos/system/fake_statistics_provider.h"
23 #include "device/bluetooth/bluetooth_adapter_factory.h" 23 #include "device/bluetooth/bluetooth_adapter_factory.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 const service_manager::ServiceInfo& remote_info, 131 const service_manager::ServiceInfo& remote_info,
132 service_manager::InterfaceRegistry* registry) { 132 service_manager::InterfaceRegistry* registry) {
133 // Register services used in both classic ash and mash. 133 // Register services used in both classic ash and mash.
134 mojo_interface_factory::RegisterInterfaces( 134 mojo_interface_factory::RegisterInterfaces(
135 registry, base::ThreadTaskRunnerHandle::Get()); 135 registry, base::ThreadTaskRunnerHandle::Get());
136 return true; 136 return true;
137 } 137 }
138 138
139 } // namespace mus 139 } // namespace mus
140 } // namespace ash 140 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/system_tray_delegate_mus.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698