Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(469)

Side by Side Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2170753005: Moves AcceleratorController from Shell to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "services/ui/public/cpp/window_tree_client_observer.h" 16 #include "services/ui/public/cpp/window_tree_client_observer.h"
17 17
18 namespace shell { 18 namespace shell {
19 class Connector; 19 class Connector;
20 } 20 }
21 21
22 namespace ui { 22 namespace ui {
23 class WindowTreeClient; 23 class WindowTreeClient;
24 } 24 }
25 25
26 namespace ash { 26 namespace ash {
27 namespace mus { 27 namespace mus {
28 28
29 class AcceleratorControllerDelegateMus;
29 class WmRootWindowControllerMus; 30 class WmRootWindowControllerMus;
30 class WmWindowMus; 31 class WmWindowMus;
31 32
32 // WmShell implementation for mus. 33 // WmShell implementation for mus.
33 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver { 34 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
34 public: 35 public:
35 WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate, 36 WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
36 ::ui::WindowTreeClient* client); 37 ::ui::WindowTreeClient* client);
37 ~WmShellMus() override; 38 ~WmShellMus() override;
38 39
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 96
96 // ::ui::WindowTreeClientObserver: 97 // ::ui::WindowTreeClientObserver:
97 void OnWindowTreeFocusChanged(::ui::Window* gained_focus, 98 void OnWindowTreeFocusChanged(::ui::Window* gained_focus,
98 ::ui::Window* lost_focus) override; 99 ::ui::Window* lost_focus) override;
99 void OnDidDestroyClient(::ui::WindowTreeClient* client) override; 100 void OnDidDestroyClient(::ui::WindowTreeClient* client) override;
100 101
101 ::ui::WindowTreeClient* client_; 102 ::ui::WindowTreeClient* client_;
102 103
103 std::vector<WmRootWindowControllerMus*> root_window_controllers_; 104 std::vector<WmRootWindowControllerMus*> root_window_controllers_;
104 105
106 std::unique_ptr<AcceleratorControllerDelegateMus>
107 accelerator_controller_delegate_;
105 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 108 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
106 109
107 base::ObserverList<WmActivationObserver> activation_observers_; 110 base::ObserverList<WmActivationObserver> activation_observers_;
108 111
109 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 112 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
110 }; 113 };
111 114
112 } // namespace mus 115 } // namespace mus
113 } // namespace ash 116 } // namespace ash
114 117
115 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 118 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698