| 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 WmWindow* NewContainerWindow() override; | 65 WmWindow* NewWindow(ui::wm::WindowType window_type, |
| 66 ui::LayerType layer_type) override; |
| 66 WmWindow* GetFocusedWindow() override; | 67 WmWindow* GetFocusedWindow() override; |
| 67 WmWindow* GetActiveWindow() override; | 68 WmWindow* GetActiveWindow() override; |
| 68 WmWindow* GetCaptureWindow() override; | 69 WmWindow* GetCaptureWindow() override; |
| 69 WmWindow* GetPrimaryRootWindow() override; | 70 WmWindow* GetPrimaryRootWindow() override; |
| 70 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; | 71 WmWindow* GetRootWindowForDisplayId(int64_t display_id) override; |
| 71 const display::ManagedDisplayInfo& GetDisplayInfo( | 72 const display::ManagedDisplayInfo& GetDisplayInfo( |
| 72 int64_t display_id) const override; | 73 int64_t display_id) const override; |
| 73 bool IsActiveDisplayId(int64_t display_id) const override; | 74 bool IsActiveDisplayId(int64_t display_id) const override; |
| 74 display::Display GetFirstDisplay() const override; | 75 display::Display GetFirstDisplay() const override; |
| 75 bool IsInUnifiedMode() const override; | 76 bool IsInUnifiedMode() const override; |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 | 145 |
| 145 base::ObserverList<WmActivationObserver> activation_observers_; | 146 base::ObserverList<WmActivationObserver> activation_observers_; |
| 146 | 147 |
| 147 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 148 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
| 148 }; | 149 }; |
| 149 | 150 |
| 150 } // namespace mus | 151 } // namespace mus |
| 151 } // namespace ash | 152 } // namespace ash |
| 152 | 153 |
| 153 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 154 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
| OLD | NEW |