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

Side by Side Diff: services/ui/ws/window_manager_state.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/user_id_tracker.cc ('k') | services/ui/ws/window_manager_state_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "services/ui/ws/window_manager_state.h" 5 #include "services/ui/ws/window_manager_state.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "services/shell/public/interfaces/connector.mojom.h" 10 #include "services/service_manager/public/interfaces/connector.mojom.h"
11 #include "services/ui/common/event_matcher_util.h" 11 #include "services/ui/common/event_matcher_util.h"
12 #include "services/ui/ws/accelerator.h" 12 #include "services/ui/ws/accelerator.h"
13 #include "services/ui/ws/display_manager.h" 13 #include "services/ui/ws/display_manager.h"
14 #include "services/ui/ws/platform_display.h" 14 #include "services/ui/ws/platform_display.h"
15 #include "services/ui/ws/server_window.h" 15 #include "services/ui/ws/server_window.h"
16 #include "services/ui/ws/user_display_manager.h" 16 #include "services/ui/ws/user_display_manager.h"
17 #include "services/ui/ws/user_id_tracker.h" 17 #include "services/ui/ws/user_id_tracker.h"
18 #include "services/ui/ws/window_manager_display_root.h" 18 #include "services/ui/ws/window_manager_display_root.h"
19 #include "services/ui/ws/window_server.h" 19 #include "services/ui/ws/window_server.h"
20 #include "services/ui/ws/window_tree.h" 20 #include "services/ui/ws/window_tree.h"
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 window->RemoveObserver(this); 635 window->RemoveObserver(this);
636 orphaned_window_manager_display_roots_.erase(iter); 636 orphaned_window_manager_display_roots_.erase(iter);
637 return; 637 return;
638 } 638 }
639 } 639 }
640 NOTREACHED(); 640 NOTREACHED();
641 } 641 }
642 642
643 } // namespace ws 643 } // namespace ws
644 } // namespace ui 644 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/user_id_tracker.cc ('k') | services/ui/ws/window_manager_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698