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

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

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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/window_manager_application.h ('k') | ash/mus/window_manager_unittest.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/mus/accelerator_registrar_impl.h" 9 #include "ash/mus/accelerator_registrar_impl.h"
10 #include "ash/mus/root_window_controller.h" 10 #include "ash/mus/root_window_controller.h"
11 #include "ash/mus/shelf_layout_impl.h" 11 #include "ash/mus/shelf_layout_impl.h"
12 #include "ash/mus/user_window_controller_impl.h" 12 #include "ash/mus/user_window_controller_impl.h"
13 #include "ash/mus/window_manager.h" 13 #include "ash/mus/window_manager.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 "components/mus/common/event_matcher_util.h"
17 #include "components/mus/common/gpu_service.h"
18 #include "components/mus/public/cpp/window.h"
19 #include "components/mus/public/cpp/window_tree_client.h"
20 #include "services/shell/public/cpp/connection.h" 16 #include "services/shell/public/cpp/connection.h"
21 #include "services/shell/public/cpp/connector.h" 17 #include "services/shell/public/cpp/connector.h"
22 #include "services/tracing/public/cpp/tracing_impl.h" 18 #include "services/tracing/public/cpp/tracing_impl.h"
19 #include "services/ui/common/event_matcher_util.h"
20 #include "services/ui/common/gpu_service.h"
21 #include "services/ui/public/cpp/window.h"
22 #include "services/ui/public/cpp/window_tree_client.h"
23 #include "ui/events/event.h" 23 #include "ui/events/event.h"
24 #include "ui/views/mus/aura_init.h" 24 #include "ui/views/mus/aura_init.h"
25 25
26 namespace ash { 26 namespace ash {
27 namespace mus { 27 namespace mus {
28 28
29 WindowManagerApplication::WindowManagerApplication() 29 WindowManagerApplication::WindowManagerApplication()
30 : connector_(nullptr), screenlock_state_listener_binding_(this) {} 30 : connector_(nullptr), screenlock_state_listener_binding_(this) {}
31 31
32 WindowManagerApplication::~WindowManagerApplication() { 32 WindowManagerApplication::~WindowManagerApplication() {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 RootWindowController* controller) { 160 RootWindowController* controller) {
161 // TODO(msw): this isn't right, ownership should belong in WindowManager 161 // TODO(msw): this isn't right, ownership should belong in WindowManager
162 // and/or RootWindowController. But this is temporary until we get rid of 162 // and/or RootWindowController. But this is temporary until we get rid of
163 // sysui. 163 // sysui.
164 shelf_layout_.reset(); 164 shelf_layout_.reset();
165 user_window_controller_.reset(); 165 user_window_controller_.reset();
166 } 166 }
167 167
168 } // namespace mus 168 } // namespace mus
169 } // namespace ash 169 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/window_manager_application.h ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698