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

Side by Side Diff: ash/mus/window_manager.h

Issue 2235363003: Wires up WmShellMus::Add/RemovePointerWatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pointer_watcher_capture
Patch Set: merge to tot again 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
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/window_manager.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 #ifndef ASH_MUS_WINDOW_MANAGER_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_
6 #define ASH_MUS_WINDOW_MANAGER_H_ 6 #define ASH_MUS_WINDOW_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <set> 11 #include <set>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "services/ui/common/types.h" 15 #include "services/ui/common/types.h"
16 #include "services/ui/public/cpp/window_manager_delegate.h" 16 #include "services/ui/public/cpp/window_manager_delegate.h"
17 #include "services/ui/public/cpp/window_observer.h" 17 #include "services/ui/public/cpp/window_observer.h"
18 #include "services/ui/public/cpp/window_tree_client_delegate.h" 18 #include "services/ui/public/cpp/window_tree_client_delegate.h"
19 #include "services/ui/public/interfaces/window_manager.mojom.h" 19 #include "services/ui/public/interfaces/window_manager.mojom.h"
20 20
21 namespace display { 21 namespace display {
22 class Display; 22 class Display;
23 class Screen; 23 class Screen;
24 } 24 }
25 25
26 namespace shell { 26 namespace shell {
27 class Connector; 27 class Connector;
28 } 28 }
29 29
30 namespace views {
31 class PointerWatcherEventRouter;
32 }
33
30 namespace ash { 34 namespace ash {
31 namespace mus { 35 namespace mus {
32 36
33 class AcceleratorHandler; 37 class AcceleratorHandler;
34 class RootWindowController; 38 class RootWindowController;
35 class ShadowController; 39 class ShadowController;
36 class WindowManagerObserver; 40 class WindowManagerObserver;
37 class WmShellMus; 41 class WmShellMus;
38 class WmLookupMus; 42 class WmLookupMus;
39 class WmTestHelper; 43 class WmTestHelper;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void OnWmCancelMoveLoop(ui::Window* window) override; 120 void OnWmCancelMoveLoop(ui::Window* window) override;
117 ui::mojom::EventResult OnAccelerator(uint32_t id, 121 ui::mojom::EventResult OnAccelerator(uint32_t id,
118 const ui::Event& event) override; 122 const ui::Event& event) override;
119 123
120 shell::Connector* connector_; 124 shell::Connector* connector_;
121 125
122 ui::WindowTreeClient* window_tree_client_ = nullptr; 126 ui::WindowTreeClient* window_tree_client_ = nullptr;
123 127
124 ui::WindowManagerClient* window_manager_client_ = nullptr; 128 ui::WindowManagerClient* window_manager_client_ = nullptr;
125 129
130 std::unique_ptr<views::PointerWatcherEventRouter>
131 pointer_watcher_event_router_;
132
126 std::unique_ptr<ShadowController> shadow_controller_; 133 std::unique_ptr<ShadowController> shadow_controller_;
127 134
128 std::set<std::unique_ptr<RootWindowController>> root_window_controllers_; 135 std::set<std::unique_ptr<RootWindowController>> root_window_controllers_;
129 136
130 base::ObserverList<WindowManagerObserver> observers_; 137 base::ObserverList<WindowManagerObserver> observers_;
131 138
132 std::unique_ptr<display::Screen> screen_; 139 std::unique_ptr<display::Screen> screen_;
133 140
134 std::unique_ptr<WmShellMus> shell_; 141 std::unique_ptr<WmShellMus> shell_;
135 142
136 std::unique_ptr<WmLookupMus> lookup_; 143 std::unique_ptr<WmLookupMus> lookup_;
137 144
138 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; 145 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
139 uint16_t next_accelerator_namespace_id_ = 0u; 146 uint16_t next_accelerator_namespace_id_ = 0u;
140 147
141 DISALLOW_COPY_AND_ASSIGN(WindowManager); 148 DISALLOW_COPY_AND_ASSIGN(WindowManager);
142 }; 149 };
143 150
144 } // namespace mus 151 } // namespace mus
145 } // namespace ash 152 } // namespace ash
146 153
147 #endif // ASH_MUS_WINDOW_MANAGER_H_ 154 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698