| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 CreateScopedDisableInternalMouseAndKeyboard() override; | 85 CreateScopedDisableInternalMouseAndKeyboard() override; |
| 86 void OnOverviewModeStarting() override; | 86 void OnOverviewModeStarting() override; |
| 87 void OnOverviewModeEnded() override; | 87 void OnOverviewModeEnded() override; |
| 88 SessionStateDelegate* GetSessionStateDelegate() override; | 88 SessionStateDelegate* GetSessionStateDelegate() override; |
| 89 void AddActivationObserver(WmActivationObserver* observer) override; | 89 void AddActivationObserver(WmActivationObserver* observer) override; |
| 90 void RemoveActivationObserver(WmActivationObserver* observer) override; | 90 void RemoveActivationObserver(WmActivationObserver* observer) override; |
| 91 void AddDisplayObserver(WmDisplayObserver* observer) override; | 91 void AddDisplayObserver(WmDisplayObserver* observer) override; |
| 92 void RemoveDisplayObserver(WmDisplayObserver* observer) override; | 92 void RemoveDisplayObserver(WmDisplayObserver* observer) override; |
| 93 void AddPointerWatcher(views::PointerWatcher* watcher) override; | 93 void AddPointerWatcher(views::PointerWatcher* watcher) override; |
| 94 void RemovePointerWatcher(views::PointerWatcher* watcher) override; | 94 void RemovePointerWatcher(views::PointerWatcher* watcher) override; |
| 95 bool IsTouchDown() override; |
| 95 #if defined(OS_CHROMEOS) | 96 #if defined(OS_CHROMEOS) |
| 96 void ToggleIgnoreExternalKeyboard() override; | 97 void ToggleIgnoreExternalKeyboard() override; |
| 97 #endif | 98 #endif |
| 98 | 99 |
| 99 private: | 100 private: |
| 100 friend class WmShellMusTestApi; | 101 friend class WmShellMusTestApi; |
| 101 | 102 |
| 102 ui::WindowTreeClient* window_tree_client(); | 103 ui::WindowTreeClient* window_tree_client(); |
| 103 | 104 |
| 104 // Returns true if |window| is a window that can have active children. | 105 // Returns true if |window| is a window that can have active children. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 121 | 122 |
| 122 base::ObserverList<WmActivationObserver> activation_observers_; | 123 base::ObserverList<WmActivationObserver> activation_observers_; |
| 123 | 124 |
| 124 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 125 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
| 125 }; | 126 }; |
| 126 | 127 |
| 127 } // namespace mus | 128 } // namespace mus |
| 128 } // namespace ash | 129 } // namespace ash |
| 129 | 130 |
| 130 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 131 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
| OLD | NEW |