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

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

Issue 2573703003: chromeos: Fix shelf appearing at login screen under mash (Closed)
Patch Set: msw comments Created 4 years 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 #endif 90 #endif
91 91
92 private: 92 private:
93 // aura::client::ActivationChangeObserver: 93 // aura::client::ActivationChangeObserver:
94 void OnWindowActivated(ActivationReason reason, 94 void OnWindowActivated(ActivationReason reason,
95 aura::Window* gained_active, 95 aura::Window* gained_active,
96 aura::Window* lost_active) override; 96 aura::Window* lost_active) override;
97 void OnAttemptToReactivateWindow(aura::Window* request_active, 97 void OnAttemptToReactivateWindow(aura::Window* request_active,
98 aura::Window* actual_active) override; 98 aura::Window* actual_active) override;
99 99
100 // SessionStateObserver:
101 void SessionStateChanged(session_manager::SessionState state) override;
102
100 // WindowTreeHostManager::Observer: 103 // WindowTreeHostManager::Observer:
101 void OnDisplayConfigurationChanging() override; 104 void OnDisplayConfigurationChanging() override;
102 void OnDisplayConfigurationChanged() override; 105 void OnDisplayConfigurationChanged() override;
103 106
104 WmLookupAura wm_lookup_; 107 WmLookupAura wm_lookup_;
105 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_; 108 std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
106 109
107 bool added_activation_observer_ = false; 110 bool added_activation_observer_ = false;
108 base::ObserverList<WmActivationObserver> activation_observers_; 111 base::ObserverList<WmActivationObserver> activation_observers_;
109 112
110 bool added_display_observer_ = false; 113 bool added_display_observer_ = false;
111 base::ObserverList<WmDisplayObserver> display_observers_; 114 base::ObserverList<WmDisplayObserver> display_observers_;
112 115
113 DISALLOW_COPY_AND_ASSIGN(WmShellAura); 116 DISALLOW_COPY_AND_ASSIGN(WmShellAura);
114 }; 117 };
115 118
116 } // namespace ash 119 } // namespace ash
117 120
118 #endif // ASH_AURA_WM_SHELL_AURA_H_ 121 #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