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

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

Issue 2837893002: Wires up InputDeviceClient for mash/mushrome (Closed)
Patch Set: comment Created 3 years, 8 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 14 matching lines...) Expand all
25 } 25 }
26 26
27 namespace display { 27 namespace display {
28 class Display; 28 class Display;
29 } 29 }
30 30
31 namespace service_manager { 31 namespace service_manager {
32 class Connector; 32 class Connector;
33 } 33 }
34 34
35 namespace ui {
36 class InputDeviceClient;
37 }
38
35 namespace views { 39 namespace views {
36 class PointerWatcherEventRouter; 40 class PointerWatcherEventRouter;
37 } 41 }
38 42
39 namespace wm { 43 namespace wm {
40 class WMState; 44 class WMState;
41 } 45 }
42 46
43 namespace ash { 47 namespace ash {
44 48
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 // ShellDelegateMus is used. 222 // ShellDelegateMus is used.
219 std::unique_ptr<ShellDelegate> shell_delegate_; 223 std::unique_ptr<ShellDelegate> shell_delegate_;
220 224
221 // See ShellPortMash's constructor for details. Tests may set to false. 225 // See ShellPortMash's constructor for details. Tests may set to false.
222 bool create_session_state_delegate_stub_for_test_ = true; 226 bool create_session_state_delegate_stub_for_test_ = true;
223 227
224 // State that is only valid during a drag. 228 // State that is only valid during a drag.
225 struct DragState; 229 struct DragState;
226 std::unique_ptr<DragState> drag_state_; 230 std::unique_ptr<DragState> drag_state_;
227 231
232 std::unique_ptr<ui::InputDeviceClient> input_device_client_;
233
228 DISALLOW_COPY_AND_ASSIGN(WindowManager); 234 DISALLOW_COPY_AND_ASSIGN(WindowManager);
229 }; 235 };
230 236
231 } // namespace mus 237 } // namespace mus
232 } // namespace ash 238 } // namespace ash
233 239
234 #endif // ASH_MUS_WINDOW_MANAGER_H_ 240 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698