| 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 <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "ash/common/wm_shell.h" | 12 #include "ash/common/wm_shell.h" |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/observer_list.h" | 14 #include "base/observer_list.h" |
| 15 #include "services/ui/public/cpp/window_tree_client_observer.h" | 15 #include "services/ui/public/cpp/window_tree_client_observer.h" |
| 16 | 16 |
| 17 namespace shell { |
| 18 class Connector; |
| 19 } |
| 20 |
| 17 namespace ui { | 21 namespace ui { |
| 18 class WindowTreeClient; | 22 class WindowTreeClient; |
| 19 } | 23 } |
| 20 | 24 |
| 21 namespace ash { | 25 namespace ash { |
| 22 namespace mus { | 26 namespace mus { |
| 23 | 27 |
| 24 class WmRootWindowControllerMus; | 28 class WmRootWindowControllerMus; |
| 25 class WmWindowMus; | 29 class WmWindowMus; |
| 26 | 30 |
| 27 // WmShell implementation for mus. | 31 // WmShell implementation for mus. |
| 28 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver { | 32 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver { |
| 29 public: | 33 public: |
| 30 WmShellMus(ShellDelegate* delegate, ::ui::WindowTreeClient* client); | 34 WmShellMus(ShellDelegate* delegate, |
| 35 ::ui::WindowTreeClient* client, |
| 36 shell::Connector* connector); |
| 31 ~WmShellMus() override; | 37 ~WmShellMus() override; |
| 32 | 38 |
| 33 static WmShellMus* Get(); | 39 static WmShellMus* Get(); |
| 34 | 40 |
| 35 void AddRootWindowController(WmRootWindowControllerMus* controller); | 41 void AddRootWindowController(WmRootWindowControllerMus* controller); |
| 36 void RemoveRootWindowController(WmRootWindowControllerMus* controller); | 42 void RemoveRootWindowController(WmRootWindowControllerMus* controller); |
| 37 | 43 |
| 38 // Returns the ancestor of |window| (including |window|) that is considered | 44 // Returns the ancestor of |window| (including |window|) that is considered |
| 39 // toplevel. |window| may be null. | 45 // toplevel. |window| may be null. |
| 40 static WmWindowMus* GetToplevelAncestor(::ui::Window* window); | 46 static WmWindowMus* GetToplevelAncestor(::ui::Window* window); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 static bool IsActivationParent(::ui::Window* window); | 90 static bool IsActivationParent(::ui::Window* window); |
| 85 | 91 |
| 86 void RemoveClientObserver(); | 92 void RemoveClientObserver(); |
| 87 | 93 |
| 88 // ::ui::WindowTreeClientObserver: | 94 // ::ui::WindowTreeClientObserver: |
| 89 void OnWindowTreeFocusChanged(::ui::Window* gained_focus, | 95 void OnWindowTreeFocusChanged(::ui::Window* gained_focus, |
| 90 ::ui::Window* lost_focus) override; | 96 ::ui::Window* lost_focus) override; |
| 91 void OnDidDestroyClient(::ui::WindowTreeClient* client) override; | 97 void OnDidDestroyClient(::ui::WindowTreeClient* client) override; |
| 92 | 98 |
| 93 ::ui::WindowTreeClient* client_; | 99 ::ui::WindowTreeClient* client_; |
| 100 shell::Connector* connector_; |
| 94 | 101 |
| 95 std::vector<WmRootWindowControllerMus*> root_window_controllers_; | 102 std::vector<WmRootWindowControllerMus*> root_window_controllers_; |
| 96 | 103 |
| 97 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 104 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
| 98 | 105 |
| 99 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; | 106 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; |
| 100 | 107 |
| 101 base::ObserverList<WmActivationObserver> activation_observers_; | 108 base::ObserverList<WmActivationObserver> activation_observers_; |
| 102 | 109 |
| 103 DISALLOW_COPY_AND_ASSIGN(WmShellMus); | 110 DISALLOW_COPY_AND_ASSIGN(WmShellMus); |
| 104 }; | 111 }; |
| 105 | 112 |
| 106 } // namespace mus | 113 } // namespace mus |
| 107 } // namespace ash | 114 } // namespace ash |
| 108 | 115 |
| 109 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ | 116 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ |
| OLD | NEW |