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

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

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 | « ash/aura/wm_shell_aura.h ('k') | ash/common/shelf/shelf_widget.h » ('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 #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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 } 316 }
317 317
318 void WmShellAura::OnAttemptToReactivateWindow(aura::Window* request_active, 318 void WmShellAura::OnAttemptToReactivateWindow(aura::Window* request_active,
319 aura::Window* actual_active) { 319 aura::Window* actual_active) {
320 for (auto& observer : activation_observers_) { 320 for (auto& observer : activation_observers_) {
321 observer.OnAttemptToReactivateWindow(WmWindowAura::Get(request_active), 321 observer.OnAttemptToReactivateWindow(WmWindowAura::Get(request_active),
322 WmWindowAura::Get(actual_active)); 322 WmWindowAura::Get(actual_active));
323 } 323 }
324 } 324 }
325 325
326 void WmShellAura::SessionStateChanged(session_manager::SessionState state) {
327 // Create the shelf if necessary.
328 WmShell::SessionStateChanged(state);
329
330 // Recreate the keyboard after initial login and after multiprofile login.
331 if (state == session_manager::SessionState::ACTIVE)
332 Shell::GetInstance()->CreateKeyboard();
333 }
334
326 void WmShellAura::OnDisplayConfigurationChanging() { 335 void WmShellAura::OnDisplayConfigurationChanging() {
327 for (auto& observer : display_observers_) 336 for (auto& observer : display_observers_)
328 observer.OnDisplayConfigurationChanging(); 337 observer.OnDisplayConfigurationChanging();
329 } 338 }
330 339
331 void WmShellAura::OnDisplayConfigurationChanged() { 340 void WmShellAura::OnDisplayConfigurationChanged() {
332 for (auto& observer : display_observers_) 341 for (auto& observer : display_observers_)
333 observer.OnDisplayConfigurationChanged(); 342 observer.OnDisplayConfigurationChanged();
334 } 343 }
335 344
336 } // namespace ash 345 } // namespace ash
OLDNEW
« no previous file with comments | « ash/aura/wm_shell_aura.h ('k') | ash/common/shelf/shelf_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698