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

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

Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash. (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 <map>
10 #include <memory> 11 #include <memory>
11 #include <vector> 12 #include <vector>
12 13
13 #include "ash/common/wm_shell.h" 14 #include "ash/common/wm_shell.h"
14 #include "base/macros.h" 15 #include "base/macros.h"
15 #include "base/observer_list.h" 16 #include "base/observer_list.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;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 138
138 std::unique_ptr<AcceleratorControllerDelegateMus> 139 std::unique_ptr<AcceleratorControllerDelegateMus>
139 accelerator_controller_delegate_; 140 accelerator_controller_delegate_;
140 std::unique_ptr<AcceleratorControllerRegistrar> 141 std::unique_ptr<AcceleratorControllerRegistrar>
141 accelerator_controller_registrar_; 142 accelerator_controller_registrar_;
142 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; 143 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_;
143 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 144 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
144 145
145 base::ObserverList<WmActivationObserver> activation_observers_; 146 base::ObserverList<WmActivationObserver> activation_observers_;
146 147
148 // A cache of stub display info objects, used in absence of DisplayManager.
149 // TODO(mash): Get actual info from DisplayManager. http://crbug.com/622480.
150 mutable std::map<int64_t, display::ManagedDisplayInfo> display_info_map_;
151
147 DISALLOW_COPY_AND_ASSIGN(WmShellMus); 152 DISALLOW_COPY_AND_ASSIGN(WmShellMus);
148 }; 153 };
149 154
150 } // namespace mus 155 } // namespace mus
151 } // namespace ash 156 } // namespace ash
152 157
153 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_ 158 #endif // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
OLDNEW
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | ash/mus/bridge/wm_shell_mus.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698