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

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

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)
Patch Set: Cleanup. Created 4 years, 3 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 "base/threading/sequenced_worker_pool.h"
16 #include "services/ui/public/cpp/window_tree_client_observer.h" 17 #include "services/ui/public/cpp/window_tree_client_observer.h"
17 18
18 namespace shell { 19 namespace shell {
19 class Connector; 20 class Connector;
20 } 21 }
21 22
22 namespace ui { 23 namespace ui {
23 class WindowTreeClient; 24 class WindowTreeClient;
24 } 25 }
25 26
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 void OnOverviewModeEnded() override; 106 void OnOverviewModeEnded() override;
106 SessionStateDelegate* GetSessionStateDelegate() override; 107 SessionStateDelegate* GetSessionStateDelegate() override;
107 void AddActivationObserver(WmActivationObserver* observer) override; 108 void AddActivationObserver(WmActivationObserver* observer) override;
108 void RemoveActivationObserver(WmActivationObserver* observer) override; 109 void RemoveActivationObserver(WmActivationObserver* observer) override;
109 void AddDisplayObserver(WmDisplayObserver* observer) override; 110 void AddDisplayObserver(WmDisplayObserver* observer) override;
110 void RemoveDisplayObserver(WmDisplayObserver* observer) override; 111 void RemoveDisplayObserver(WmDisplayObserver* observer) override;
111 void AddPointerWatcher(views::PointerWatcher* watcher, 112 void AddPointerWatcher(views::PointerWatcher* watcher,
112 views::PointerWatcherEventTypes events) override; 113 views::PointerWatcherEventTypes events) override;
113 void RemovePointerWatcher(views::PointerWatcher* watcher) override; 114 void RemovePointerWatcher(views::PointerWatcher* watcher) override;
114 bool IsTouchDown() override; 115 bool IsTouchDown() override;
116 base::SequencedWorkerPool* GetBlockingPool() override;
115 #if defined(OS_CHROMEOS) 117 #if defined(OS_CHROMEOS)
116 void ToggleIgnoreExternalKeyboard() override; 118 void ToggleIgnoreExternalKeyboard() override;
117 #endif 119 #endif
118 120
119 private: 121 private:
120 friend class WmShellMusTestApi; 122 friend class WmShellMusTestApi;
121 123
122 ui::WindowTreeClient* window_tree_client(); 124 ui::WindowTreeClient* window_tree_client();
123 125
124 // Returns true if |window| is a window that can have active children. 126 // Returns true if |window| is a window that can have active children.
(...skipping 12 matching lines...) Expand all
137 139
138 std::unique_ptr<AcceleratorControllerDelegateMus> 140 std::unique_ptr<AcceleratorControllerDelegateMus>
139 accelerator_controller_delegate_; 141 accelerator_controller_delegate_;
140 std::unique_ptr<AcceleratorControllerRegistrar> 142 std::unique_ptr<AcceleratorControllerRegistrar>
141 accelerator_controller_registrar_; 143 accelerator_controller_registrar_;
142 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 144 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
143 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 145 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
144 146
145 base::ObserverList<WmActivationObserver> activation_observers_; 147 base::ObserverList<WmActivationObserver> activation_observers_;
146 148
149 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
150
147 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 151 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
148 }; 152 };
149 153
150 } // namespace mus 154 } // namespace mus
151 } // namespace ash 155 } // namespace ash
152 156
153 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 157 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698