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

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

Issue 2184943002: services/ui: Move some files into the client lib. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome-gpu-in-mus-windows
Patch Set: . Created 4 years, 4 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
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/mus/accelerators/accelerator_registrar_impl.h" 10 #include "ash/mus/accelerators/accelerator_registrar_impl.h"
11 #include "ash/mus/root_window_controller.h" 11 #include "ash/mus/root_window_controller.h"
12 #include "ash/mus/shelf_layout_impl.h" 12 #include "ash/mus/shelf_layout_impl.h"
13 #include "ash/mus/user_window_controller_impl.h" 13 #include "ash/mus/user_window_controller_impl.h"
14 #include "ash/mus/window_manager.h" 14 #include "ash/mus/window_manager.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "services/shell/public/cpp/connection.h" 17 #include "services/shell/public/cpp/connection.h"
18 #include "services/shell/public/cpp/connector.h" 18 #include "services/shell/public/cpp/connector.h"
19 #include "services/tracing/public/cpp/tracing_impl.h" 19 #include "services/tracing/public/cpp/tracing_impl.h"
20 #include "services/ui/common/event_matcher_util.h" 20 #include "services/ui/common/event_matcher_util.h"
21 #include "services/ui/common/gpu_service.h" 21 #include "services/ui/public/cpp/gpu_service.h"
22 #include "services/ui/public/cpp/window.h" 22 #include "services/ui/public/cpp/window.h"
23 #include "services/ui/public/cpp/window_tree_client.h" 23 #include "services/ui/public/cpp/window_tree_client.h"
24 #include "ui/events/event.h" 24 #include "ui/events/event.h"
25 #include "ui/message_center/message_center.h" 25 #include "ui/message_center/message_center.h"
26 #include "ui/views/mus/aura_init.h" 26 #include "ui/views/mus/aura_init.h"
27 27
28 #if defined(OS_CHROMEOS) 28 #if defined(OS_CHROMEOS)
29 #include "ash/common/system/chromeos/power/power_status.h" 29 #include "ash/common/system/chromeos/power/power_status.h"
30 #include "chromeos/audio/cras_audio_handler.h" 30 #include "chromeos/audio/cras_audio_handler.h"
31 #include "chromeos/dbus/dbus_thread_manager.h" 31 #include "chromeos/dbus/dbus_thread_manager.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 RootWindowController* controller) { 198 RootWindowController* controller) {
199 // TODO(msw): this isn't right, ownership should belong in WindowManager 199 // TODO(msw): this isn't right, ownership should belong in WindowManager
200 // and/or RootWindowController. But this is temporary until we get rid of 200 // and/or RootWindowController. But this is temporary until we get rid of
201 // sysui. 201 // sysui.
202 shelf_layout_.reset(); 202 shelf_layout_.reset();
203 user_window_controller_.reset(); 203 user_window_controller_.reset();
204 } 204 }
205 205
206 } // namespace mus 206 } // namespace mus
207 } // namespace ash 207 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | services/ui/public/cpp/gpu_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698