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_SHELL_PORT_MASH_H_ | 5 #ifndef ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ |
6 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ | 6 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 void AddPointerWatcher(views::PointerWatcher* watcher, | 99 void AddPointerWatcher(views::PointerWatcher* watcher, |
100 views::PointerWatcherEventTypes events) override; | 100 views::PointerWatcherEventTypes events) override; |
101 void RemovePointerWatcher(views::PointerWatcher* watcher) override; | 101 void RemovePointerWatcher(views::PointerWatcher* watcher) override; |
102 bool IsTouchDown() override; | 102 bool IsTouchDown() override; |
103 void ToggleIgnoreExternalKeyboard() override; | 103 void ToggleIgnoreExternalKeyboard() override; |
104 void SetLaserPointerEnabled(bool enabled) override; | 104 void SetLaserPointerEnabled(bool enabled) override; |
105 void SetPartialMagnifierEnabled(bool enabled) override; | 105 void SetPartialMagnifierEnabled(bool enabled) override; |
106 void CreatePointerWatcherAdapter() override; | 106 void CreatePointerWatcherAdapter() override; |
107 std::unique_ptr<AshWindowTreeHost> CreateAshWindowTreeHost( | 107 std::unique_ptr<AshWindowTreeHost> CreateAshWindowTreeHost( |
108 const AshWindowTreeHostInitParams& init_params) override; | 108 const AshWindowTreeHostInitParams& init_params) override; |
| 109 void OnCreatedRootWindowContainers( |
| 110 RootWindowController* root_window_controller) override; |
109 void CreatePrimaryHost() override; | 111 void CreatePrimaryHost() override; |
110 void InitHosts(const ShellInitParams& init_params) override; | 112 void InitHosts(const ShellInitParams& init_params) override; |
111 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate() | 113 std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate() |
112 override; | 114 override; |
113 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override; | 115 std::unique_ptr<AcceleratorController> CreateAcceleratorController() override; |
114 | 116 |
115 private: | 117 private: |
116 friend class ShellPortMashTestApi; | 118 friend class ShellPortMashTestApi; |
117 | 119 |
118 struct MashSpecificState { | 120 struct MashSpecificState { |
(...skipping 28 matching lines...) Expand all Loading... |
147 | 149 |
148 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 150 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
149 | 151 |
150 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); | 152 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); |
151 }; | 153 }; |
152 | 154 |
153 } // namespace mus | 155 } // namespace mus |
154 } // namespace ash | 156 } // namespace ash |
155 | 157 |
156 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ | 158 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ |
OLD | NEW |