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

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

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 3 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 #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>
(...skipping 17 matching lines...) Expand all
28 } 28 }
29 29
30 namespace views { 30 namespace views {
31 class PointerWatcherEventRouter; 31 class PointerWatcherEventRouter;
32 } 32 }
33 33
34 namespace ash { 34 namespace ash {
35 namespace mus { 35 namespace mus {
36 36
37 class AcceleratorHandler; 37 class AcceleratorHandler;
38 class NativeWidgetFactoryMus;
38 class RootWindowController; 39 class RootWindowController;
39 class ShadowController; 40 class ShadowController;
40 class WindowManagerObserver; 41 class WindowManagerObserver;
41 class WmShellMus; 42 class WmShellMus;
42 class WmLookupMus; 43 class WmLookupMus;
43 class WmTestHelper; 44 class WmTestHelper;
44 45
45 // WindowManager serves as the WindowManagerDelegate and 46 // WindowManager serves as the WindowManagerDelegate and
46 // WindowTreeClientDelegate for mash. WindowManager creates (and owns) 47 // WindowTreeClientDelegate for mash. WindowManager creates (and owns)
47 // a RootWindowController per Display. WindowManager takes ownership of 48 // a RootWindowController per Display. WindowManager takes ownership of
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 void OnWmCancelMoveLoop(ui::Window* window) override; 121 void OnWmCancelMoveLoop(ui::Window* window) override;
121 ui::mojom::EventResult OnAccelerator(uint32_t id, 122 ui::mojom::EventResult OnAccelerator(uint32_t id,
122 const ui::Event& event) override; 123 const ui::Event& event) override;
123 124
124 shell::Connector* connector_; 125 shell::Connector* connector_;
125 126
126 ui::WindowTreeClient* window_tree_client_ = nullptr; 127 ui::WindowTreeClient* window_tree_client_ = nullptr;
127 128
128 ui::WindowManagerClient* window_manager_client_ = nullptr; 129 ui::WindowManagerClient* window_manager_client_ = nullptr;
129 130
131 std::unique_ptr<NativeWidgetFactoryMus> native_widget_factory_mus_;
132
130 std::unique_ptr<views::PointerWatcherEventRouter> 133 std::unique_ptr<views::PointerWatcherEventRouter>
131 pointer_watcher_event_router_; 134 pointer_watcher_event_router_;
132 135
133 std::unique_ptr<ShadowController> shadow_controller_; 136 std::unique_ptr<ShadowController> shadow_controller_;
134 137
135 std::set<std::unique_ptr<RootWindowController>> root_window_controllers_; 138 std::set<std::unique_ptr<RootWindowController>> root_window_controllers_;
136 139
137 base::ObserverList<WindowManagerObserver> observers_; 140 base::ObserverList<WindowManagerObserver> observers_;
138 141
139 std::unique_ptr<display::Screen> screen_; 142 std::unique_ptr<display::Screen> screen_;
140 143
141 std::unique_ptr<WmShellMus> shell_; 144 std::unique_ptr<WmShellMus> shell_;
142 145
143 std::unique_ptr<WmLookupMus> lookup_; 146 std::unique_ptr<WmLookupMus> lookup_;
144 147
145 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; 148 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
146 uint16_t next_accelerator_namespace_id_ = 0u; 149 uint16_t next_accelerator_namespace_id_ = 0u;
147 150
148 DISALLOW_COPY_AND_ASSIGN(WindowManager); 151 DISALLOW_COPY_AND_ASSIGN(WindowManager);
149 }; 152 };
150 153
151 } // namespace mus 154 } // namespace mus
152 } // namespace ash 155 } // namespace ash
153 156
154 #endif // ASH_MUS_WINDOW_MANAGER_H_ 157 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698