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

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

Issue 2628933003: Revert of Reland: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | ash/aura/wm_shell_aura.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"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 void SetLaserPointerEnabled(bool enabled) override; 88 void SetLaserPointerEnabled(bool enabled) override;
89 89
90 private: 90 private:
91 // aura::client::ActivationChangeObserver: 91 // aura::client::ActivationChangeObserver:
92 void OnWindowActivated(ActivationReason reason, 92 void OnWindowActivated(ActivationReason reason,
93 aura::Window* gained_active, 93 aura::Window* gained_active,
94 aura::Window* lost_active) override; 94 aura::Window* lost_active) override;
95 void OnAttemptToReactivateWindow(aura::Window* request_active, 95 void OnAttemptToReactivateWindow(aura::Window* request_active,
96 aura::Window* actual_active) override; 96 aura::Window* actual_active) override;
97 97
98 // SessionStateObserver:
99 void SessionStateChanged(session_manager::SessionState state) override;
100
101 // WindowTreeHostManager::Observer: 98 // WindowTreeHostManager::Observer:
102 void OnDisplayConfigurationChanging() override; 99 void OnDisplayConfigurationChanging() override;
103 void OnDisplayConfigurationChanged() override; 100 void OnDisplayConfigurationChanged() override;
104 101
105 WmLookupAura wm_lookup_; 102 WmLookupAura wm_lookup_;
106 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; 103 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
107 104
108 bool added_activation_observer_ = false; 105 bool added_activation_observer_ = false;
109 base::ObserverList<WmActivationObserver> activation_observers_; 106 base::ObserverList<WmActivationObserver> activation_observers_;
110 107
111 bool added_display_observer_ = false; 108 bool added_display_observer_ = false;
112 base::ObserverList<WmDisplayObserver> display_observers_; 109 base::ObserverList<WmDisplayObserver> display_observers_;
113 110
114 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 111 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
115 }; 112 };
116 113
117 } // namespace ash 114 } // namespace ash
118 115
119 #endif // ASH_AURA_WM_SHELL_AURA_H_ 116 #endif // ASH_AURA_WM_SHELL_AURA_H_
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698