| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shell.h" | 5 #include "ash/shell.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 // Use translucent-style window frames for dialogs. | 342 // Use translucent-style window frames for dialogs. |
| 343 return new CustomFrameViewAsh(widget); | 343 return new CustomFrameViewAsh(widget); |
| 344 } | 344 } |
| 345 | 345 |
| 346 void Shell::SetDisplayWorkAreaInsets(Window* contains, | 346 void Shell::SetDisplayWorkAreaInsets(Window* contains, |
| 347 const gfx::Insets& insets) { | 347 const gfx::Insets& insets) { |
| 348 if (!window_tree_host_manager_->UpdateWorkAreaOfDisplayNearestWindow( | 348 if (!window_tree_host_manager_->UpdateWorkAreaOfDisplayNearestWindow( |
| 349 contains, insets)) { | 349 contains, insets)) { |
| 350 return; | 350 return; |
| 351 } | 351 } |
| 352 FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(), | |
| 353 OnDisplayWorkAreaInsetsChanged()); | |
| 354 } | 352 } |
| 355 | 353 |
| 356 void Shell::OnLoginStateChanged(LoginStatus status) { | 354 void Shell::OnLoginStateChanged(LoginStatus status) { |
| 357 FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(), | 355 FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(), |
| 358 OnLoginStateChanged(status)); | 356 OnLoginStateChanged(status)); |
| 359 } | 357 } |
| 360 | 358 |
| 361 void Shell::OnLoginUserProfilePrepared() { | 359 void Shell::OnLoginUserProfilePrepared() { |
| 362 CreateShelf(); | 360 CreateShelf(); |
| 363 CreateKeyboard(); | 361 CreateKeyboard(); |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1175 | 1173 |
| 1176 void Shell::OnWindowActivated( | 1174 void Shell::OnWindowActivated( |
| 1177 aura::client::ActivationChangeObserver::ActivationReason reason, | 1175 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 1178 aura::Window* gained_active, | 1176 aura::Window* gained_active, |
| 1179 aura::Window* lost_active) { | 1177 aura::Window* lost_active) { |
| 1180 if (gained_active) | 1178 if (gained_active) |
| 1181 target_root_window_ = gained_active->GetRootWindow(); | 1179 target_root_window_ = gained_active->GetRootWindow(); |
| 1182 } | 1180 } |
| 1183 | 1181 |
| 1184 } // namespace ash | 1182 } // namespace ash |
| OLD | NEW |