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

Side by Side Diff: services/ui/ws/window_server.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 | « services/ui/ws/window_server.h ('k') | services/ui/ws/window_server_delegate.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/mus/ws/window_server.h" 5 #include "services/ui/ws/window_server.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "components/mus/ws/display.h"
14 #include "components/mus/ws/display_binding.h"
15 #include "components/mus/ws/display_manager.h"
16 #include "components/mus/ws/operation.h"
17 #include "components/mus/ws/server_window.h"
18 #include "components/mus/ws/user_activity_monitor.h"
19 #include "components/mus/ws/window_coordinate_conversions.h"
20 #include "components/mus/ws/window_manager_access_policy.h"
21 #include "components/mus/ws/window_manager_display_root.h"
22 #include "components/mus/ws/window_manager_state.h"
23 #include "components/mus/ws/window_manager_window_tree_factory.h"
24 #include "components/mus/ws/window_server_delegate.h"
25 #include "components/mus/ws/window_tree.h"
26 #include "components/mus/ws/window_tree_binding.h"
27 #include "services/shell/public/cpp/connection.h" 13 #include "services/shell/public/cpp/connection.h"
14 #include "services/ui/ws/display.h"
15 #include "services/ui/ws/display_binding.h"
16 #include "services/ui/ws/display_manager.h"
17 #include "services/ui/ws/operation.h"
18 #include "services/ui/ws/server_window.h"
19 #include "services/ui/ws/user_activity_monitor.h"
20 #include "services/ui/ws/window_coordinate_conversions.h"
21 #include "services/ui/ws/window_manager_access_policy.h"
22 #include "services/ui/ws/window_manager_display_root.h"
23 #include "services/ui/ws/window_manager_state.h"
24 #include "services/ui/ws/window_manager_window_tree_factory.h"
25 #include "services/ui/ws/window_server_delegate.h"
26 #include "services/ui/ws/window_tree.h"
27 #include "services/ui/ws/window_tree_binding.h"
28 #include "ui/gfx/geometry/size_conversions.h" 28 #include "ui/gfx/geometry/size_conversions.h"
29 29
30 namespace mus { 30 namespace mus {
31 namespace ws { 31 namespace ws {
32 32
33 WindowServer::WindowServer( 33 WindowServer::WindowServer(
34 WindowServerDelegate* delegate, 34 WindowServerDelegate* delegate,
35 const scoped_refptr<mus::SurfacesState>& surfaces_state) 35 const scoped_refptr<mus::SurfacesState>& surfaces_state)
36 : delegate_(delegate), 36 : delegate_(delegate),
37 surfaces_state_(surfaces_state), 37 surfaces_state_(surfaces_state),
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 void WindowServer::OnUserIdAdded(const UserId& id) { 698 void WindowServer::OnUserIdAdded(const UserId& id) {
699 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr); 699 activity_monitor_map_[id] = base::MakeUnique<UserActivityMonitor>(nullptr);
700 } 700 }
701 701
702 void WindowServer::OnUserIdRemoved(const UserId& id) { 702 void WindowServer::OnUserIdRemoved(const UserId& id) {
703 activity_monitor_map_.erase(id); 703 activity_monitor_map_.erase(id);
704 } 704 }
705 705
706 } // namespace ws 706 } // namespace ws
707 } // namespace mus 707 } // namespace mus
OLDNEW
« no previous file with comments | « services/ui/ws/window_server.h ('k') | services/ui/ws/window_server_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698