OLD | NEW |
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 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 5 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 6 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 CreateScopedDisableInternalMouseAndKeyboard() override; | 90 CreateScopedDisableInternalMouseAndKeyboard() override; |
91 std::unique_ptr<WmImmersiveFullscreenController> | 91 std::unique_ptr<WmImmersiveFullscreenController> |
92 CreateImmersiveFullscreenController() override; | 92 CreateImmersiveFullscreenController() override; |
93 void OnOverviewModeStarting() override; | 93 void OnOverviewModeStarting() override; |
94 void OnOverviewModeEnded() override; | 94 void OnOverviewModeEnded() override; |
95 SessionStateDelegate* GetSessionStateDelegate() override; | 95 SessionStateDelegate* GetSessionStateDelegate() override; |
96 void AddActivationObserver(WmActivationObserver* observer) override; | 96 void AddActivationObserver(WmActivationObserver* observer) override; |
97 void RemoveActivationObserver(WmActivationObserver* observer) override; | 97 void RemoveActivationObserver(WmActivationObserver* observer) override; |
98 void AddDisplayObserver(WmDisplayObserver* observer) override; | 98 void AddDisplayObserver(WmDisplayObserver* observer) override; |
99 void RemoveDisplayObserver(WmDisplayObserver* observer) override; | 99 void RemoveDisplayObserver(WmDisplayObserver* observer) override; |
100 void AddPointerWatcher(views::PointerWatcher* watcher) override; | 100 void AddPointerWatcher(views::PointerWatcher* watcher, |
| 101 bool wants_moves_ = false) override; |
101 void RemovePointerWatcher(views::PointerWatcher* watcher) override; | 102 void RemovePointerWatcher(views::PointerWatcher* watcher) override; |
102 bool IsTouchDown() override; | 103 bool IsTouchDown() override; |
103 #if defined(OS_CHROMEOS) | 104 #if defined(OS_CHROMEOS) |
104 void ToggleIgnoreExternalKeyboard() override; | 105 void ToggleIgnoreExternalKeyboard() override; |
105 #endif | 106 #endif |
106 | 107 |
107 private: | 108 private: |
108 friend class WmShellMusTestApi; | 109 friend class WmShellMusTestApi; |
109 | 110 |
110 ui::WindowTreeClient* window_tree_client(); | 111 ui::WindowTreeClient* window_tree_client(); |
(...skipping 18 matching lines...) Expand all Loading... |
129 | 130 |
130 base::ObserverList<WmActivationObserver> activation_observers_; | 131 base::ObserverList<WmActivationObserver> activation_observers_; |
131 | 132 |
132 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 133 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
133 }; | 134 }; |
134 | 135 |
135 } // namespace mus | 136 } // namespace mus |
136 } // namespace ash | 137 } // namespace ash |
137 | 138 |
138 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 139 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
OLD | NEW |