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

Side by Side Diff: ash/aura/wm_shell_aura.h

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Clean up include and modify comment. Created 3 years, 9 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
« no previous file with comments | « ash/aura/wm_lookup_aura.cc ('k') | ash/common/devtools/ash_devtools_css_agent.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_AURA_WM_SHELL_AURA_H_ 5 #ifndef ASH_AURA_WM_SHELL_AURA_H_
6 #define ASH_AURA_WM_SHELL_AURA_H_ 6 #define ASH_AURA_WM_SHELL_AURA_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/aura/wm_lookup_aura.h"
12 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
13 #include "ash/display/window_tree_host_manager.h" 12 #include "ash/display/window_tree_host_manager.h"
14 #include "base/macros.h" 13 #include "base/macros.h"
15 #include "base/observer_list.h" 14 #include "base/observer_list.h"
16 15
17 namespace ash { 16 namespace ash {
18 17
19 class PointerWatcherAdapter; 18 class PointerWatcherAdapter;
20 19
21 class ASH_EXPORT WmShellAura : public WmShell, 20 class ASH_EXPORT WmShellAura : public WmShell,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 void InitHosts(const ShellInitParams& init_params) override; 85 void InitHosts(const ShellInitParams& init_params) override;
87 86
88 private: 87 private:
89 // SessionStateObserver: 88 // SessionStateObserver:
90 void SessionStateChanged(session_manager::SessionState state) override; 89 void SessionStateChanged(session_manager::SessionState state) override;
91 90
92 // WindowTreeHostManager::Observer: 91 // WindowTreeHostManager::Observer:
93 void OnDisplayConfigurationChanging() override; 92 void OnDisplayConfigurationChanging() override;
94 void OnDisplayConfigurationChanged() override; 93 void OnDisplayConfigurationChanged() override;
95 94
96 WmLookupAura wm_lookup_;
97 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; 95 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
98 96
99 bool added_display_observer_ = false; 97 bool added_display_observer_ = false;
100 base::ObserverList<WmDisplayObserver> display_observers_; 98 base::ObserverList<WmDisplayObserver> display_observers_;
101 99
102 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 100 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
103 }; 101 };
104 102
105 } // namespace ash 103 } // namespace ash
106 104
107 #endif // ASH_AURA_WM_SHELL_AURA_H_ 105 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « ash/aura/wm_lookup_aura.cc ('k') | ash/common/devtools/ash_devtools_css_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698