OLD | NEW |
---|---|
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 #include "ash/aura/wm_shell_aura.h" | 5 #include "ash/aura/wm_shell_aura.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/aura/key_event_watcher_aura.h" | 9 #include "ash/aura/key_event_watcher_aura.h" |
10 #include "ash/aura/pointer_watcher_adapter.h" | 10 #include "ash/aura/pointer_watcher_adapter.h" |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
239 void WmShellAura::OnOverviewModeStarting() { | 239 void WmShellAura::OnOverviewModeStarting() { |
240 for (auto& observer : *shell_observers()) | 240 for (auto& observer : *shell_observers()) |
241 observer.OnOverviewModeStarting(); | 241 observer.OnOverviewModeStarting(); |
242 } | 242 } |
243 | 243 |
244 void WmShellAura::OnOverviewModeEnded() { | 244 void WmShellAura::OnOverviewModeEnded() { |
245 for (auto& observer : *shell_observers()) | 245 for (auto& observer : *shell_observers()) |
246 observer.OnOverviewModeEnded(); | 246 observer.OnOverviewModeEnded(); |
247 } | 247 } |
248 | 248 |
249 void WmShellAura::OnUserSessionStateActive() { | |
250 CreateShelf(); | |
msw
2016/12/16 16:26:20
It's a bit odd that we'll potentially call CreateS
James Cook
2016/12/20 04:02:42
OK, fixed that.
(I could also just rename this fu
| |
251 Shell::GetInstance()->CreateKeyboard(); | |
msw
2016/12/16 16:26:20
Is this necessary here? Shouldn't it be triggered
James Cook
2016/12/20 04:02:42
The virtual keyboard can be shown at the login scr
| |
252 } | |
253 | |
249 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() { | 254 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() { |
250 return Shell::GetInstance()->session_state_delegate(); | 255 return Shell::GetInstance()->session_state_delegate(); |
251 } | 256 } |
252 | 257 |
253 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) { | 258 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) { |
254 if (!added_activation_observer_) { | 259 if (!added_activation_observer_) { |
255 added_activation_observer_ = true; | 260 added_activation_observer_ = true; |
256 Shell::GetInstance()->activation_client()->AddObserver(this); | 261 Shell::GetInstance()->activation_client()->AddObserver(this); |
257 } | 262 } |
258 activation_observers_.AddObserver(observer); | 263 activation_observers_.AddObserver(observer); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
327 for (auto& observer : display_observers_) | 332 for (auto& observer : display_observers_) |
328 observer.OnDisplayConfigurationChanging(); | 333 observer.OnDisplayConfigurationChanging(); |
329 } | 334 } |
330 | 335 |
331 void WmShellAura::OnDisplayConfigurationChanged() { | 336 void WmShellAura::OnDisplayConfigurationChanged() { |
332 for (auto& observer : display_observers_) | 337 for (auto& observer : display_observers_) |
333 observer.OnDisplayConfigurationChanged(); | 338 observer.OnDisplayConfigurationChanged(); |
334 } | 339 } |
335 | 340 |
336 } // namespace ash | 341 } // namespace ash |
OLD | NEW |