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

Side by Side Diff: ash/common/wm_shell.cc

Issue 2704173002: Update the layout mode first when exiting tablet mode (Closed)
Patch Set: . Created 3 years, 10 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
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/common/wm_shell.h" 5 #include "ash/common/wm_shell.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/accelerators/ash_focus_manager_factory.h" 10 #include "ash/common/accelerators/ash_focus_manager_factory.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0); 175 DCHECK_GT(GetSessionStateDelegate()->NumberOfLoggedInUsers(), 0);
176 shelf_delegate_.reset(delegate_->CreateShelfDelegate(shelf_model())); 176 shelf_delegate_.reset(delegate_->CreateShelfDelegate(shelf_model()));
177 shelf_window_watcher_.reset(new ShelfWindowWatcher(shelf_model())); 177 shelf_window_watcher_.reset(new ShelfWindowWatcher(shelf_model()));
178 } 178 }
179 179
180 void WmShell::OnMaximizeModeStarted() { 180 void WmShell::OnMaximizeModeStarted() {
181 for (auto& observer : shell_observers_) 181 for (auto& observer : shell_observers_)
182 observer.OnMaximizeModeStarted(); 182 observer.OnMaximizeModeStarted();
183 } 183 }
184 184
185 void WmShell::OnMaximizeModeEnding() {
186 for (auto& observer : shell_observers_)
187 observer.OnMaximizeModeEnding();
188 }
189
185 void WmShell::OnMaximizeModeEnded() { 190 void WmShell::OnMaximizeModeEnded() {
186 for (auto& observer : shell_observers_) 191 for (auto& observer : shell_observers_)
187 observer.OnMaximizeModeEnded(); 192 observer.OnMaximizeModeEnded();
188 } 193 }
189 194
190 void WmShell::UpdateAfterLoginStatusChange(LoginStatus status) { 195 void WmShell::UpdateAfterLoginStatusChange(LoginStatus status) {
191 for (WmWindow* root_window : GetAllRootWindows()) { 196 for (WmWindow* root_window : GetAllRootWindows()) {
192 root_window->GetRootWindowController()->UpdateAfterLoginStatusChange( 197 root_window->GetRootWindowController()->UpdateAfterLoginStatusChange(
193 status); 198 status);
194 } 199 }
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 461
457 void WmShell::OnAttemptToReactivateWindow(aura::Window* request_active, 462 void WmShell::OnAttemptToReactivateWindow(aura::Window* request_active,
458 aura::Window* actual_active) { 463 aura::Window* actual_active) {
459 for (auto& observer : activation_observers_) { 464 for (auto& observer : activation_observers_) {
460 observer.OnAttemptToReactivateWindow(WmWindow::Get(request_active), 465 observer.OnAttemptToReactivateWindow(WmWindow::Get(request_active),
461 WmWindow::Get(actual_active)); 466 WmWindow::Get(actual_active));
462 } 467 }
463 } 468 }
464 469
465 } // namespace ash 470 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698