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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 // toplevel. |window| may be null. | 55 // toplevel. |window| may be null. |
56 static WmWindowMus* GetToplevelAncestor(ui::Window* window); | 56 static WmWindowMus* GetToplevelAncestor(ui::Window* window); |
57 | 57 |
58 WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id); | 58 WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id); |
59 | 59 |
60 AcceleratorControllerDelegateMus* accelerator_controller_delegate() { | 60 AcceleratorControllerDelegateMus* accelerator_controller_delegate() { |
61 return accelerator_controller_delegate_.get(); | 61 return accelerator_controller_delegate_.get(); |
62 } | 62 } |
63 | 63 |
64 // WmShell: | 64 // WmShell: |
| 65 bool IsRunningInMash() const override; |
65 WmWindow* NewWindow(ui::wm::WindowType window_type, | 66 WmWindow* NewWindow(ui::wm::WindowType window_type, |
66 ui::LayerType layer_type) override; | 67 ui::LayerType layer_type) override; |
67 WmWindow* GetFocusedWindow() override; | 68 WmWindow* GetFocusedWindow() override; |
68 WmWindow* GetActiveWindow() override; | 69 WmWindow* GetActiveWindow() override; |
69 WmWindow* GetCaptureWindow() override; | 70 WmWindow* GetCaptureWindow() override; |
70 WmWindow* GetPrimaryRootWindow() override; | 71 WmWindow* GetPrimaryRootWindow() override; |
71 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; | 72 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; |
72 const display::ManagedDisplayInfo& GetDisplayInfo( | 73 const display::ManagedDisplayInfo& GetDisplayInfo( |
73 int64_t display_id) const override; | 74 int64_t display_id) const override; |
74 bool IsActiveDisplayId(int64_t display_id) const override; | 75 bool IsActiveDisplayId(int64_t display_id) const override; |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 | 147 |
147 base::ObserverList<WmActivationObserver> activation_observers_; | 148 base::ObserverList<WmActivationObserver> activation_observers_; |
148 | 149 |
149 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 150 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
150 }; | 151 }; |
151 | 152 |
152 } // namespace mus | 153 } // namespace mus |
153 } // namespace ash | 154 } // namespace ash |
154 | 155 |
155 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 156 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
OLD | NEW |