| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 AcceleratorControllerDelegateAura* accelerator_controller_delegate_mus() { | 53 AcceleratorControllerDelegateAura* accelerator_controller_delegate_mus() { |
| 54 return mus_state_->accelerator_controller_delegate.get(); | 54 return mus_state_->accelerator_controller_delegate.get(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 aura::WindowTreeClient* window_tree_client(); | 57 aura::WindowTreeClient* window_tree_client(); |
| 58 | 58 |
| 59 WindowManager* window_manager() { return window_manager_; } | 59 WindowManager* window_manager() { return window_manager_; } |
| 60 | 60 |
| 61 // ShellPort: | 61 // ShellPort: |
| 62 void Shutdown() override; | 62 void Shutdown() override; |
| 63 bool IsRunningInMash() const override; | |
| 64 Config GetAshConfig() const override; | 63 Config GetAshConfig() const override; |
| 65 WmWindow* GetPrimaryRootWindow() override; | 64 WmWindow* GetPrimaryRootWindow() override; |
| 66 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; | 65 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; |
| 67 const display::ManagedDisplayInfo& GetDisplayInfo( | 66 const display::ManagedDisplayInfo& GetDisplayInfo( |
| 68 int64_t display_id) const override; | 67 int64_t display_id) const override; |
| 69 bool IsActiveDisplayId(int64_t display_id) const override; | 68 bool IsActiveDisplayId(int64_t display_id) const override; |
| 70 display::Display GetFirstDisplay() const override; | 69 display::Display GetFirstDisplay() const override; |
| 71 bool IsInUnifiedMode() const override; | 70 bool IsInUnifiedMode() const override; |
| 72 bool IsInUnifiedModeIgnoreMirroring() const override; | 71 bool IsInUnifiedModeIgnoreMirroring() const override; |
| 73 void SetDisplayWorkAreaInsets(WmWindow* window, | 72 void SetDisplayWorkAreaInsets(WmWindow* window, |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 | 143 |
| 145 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 144 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
| 146 | 145 |
| 147 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); | 146 DISALLOW_COPY_AND_ASSIGN(ShellPortMash); |
| 148 }; | 147 }; |
| 149 | 148 |
| 150 } // namespace mus | 149 } // namespace mus |
| 151 } // namespace ash | 150 } // namespace ash |
| 152 | 151 |
| 153 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ | 152 #endif // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_ |
| OLD | NEW |