| 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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 // Use translucent-style window frames for dialogs. | 310 // Use translucent-style window frames for dialogs. |
| 311 return new CustomFrameViewAsh(widget); | 311 return new CustomFrameViewAsh(widget); |
| 312 } | 312 } |
| 313 | 313 |
| 314 void Shell::SetDisplayWorkAreaInsets(Window* contains, | 314 void Shell::SetDisplayWorkAreaInsets(Window* contains, |
| 315 const gfx::Insets& insets) { | 315 const gfx::Insets& insets) { |
| 316 if (!window_tree_host_manager_->UpdateWorkAreaOfDisplayNearestWindow( | 316 if (!window_tree_host_manager_->UpdateWorkAreaOfDisplayNearestWindow( |
| 317 contains, insets)) { | 317 contains, insets)) { |
| 318 return; | 318 return; |
| 319 } | 319 } |
| 320 FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(), | |
| 321 OnDisplayWorkAreaInsetsChanged()); | |
| 322 } | 320 } |
| 323 | 321 |
| 324 void Shell::OnLoginStateChanged(LoginStatus status) { | 322 void Shell::OnLoginStateChanged(LoginStatus status) { |
| 325 FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(), | 323 FOR_EACH_OBSERVER(ShellObserver, *wm_shell_->shell_observers(), |
| 326 OnLoginStateChanged(status)); | 324 OnLoginStateChanged(status)); |
| 327 } | 325 } |
| 328 | 326 |
| 329 void Shell::OnLoginUserProfilePrepared() { | 327 void Shell::OnLoginUserProfilePrepared() { |
| 330 CreateShelf(); | 328 CreateShelf(); |
| 331 CreateKeyboard(); | 329 CreateKeyboard(); |
| (...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 | 1104 |
| 1107 void Shell::OnWindowActivated( | 1105 void Shell::OnWindowActivated( |
| 1108 aura::client::ActivationChangeObserver::ActivationReason reason, | 1106 aura::client::ActivationChangeObserver::ActivationReason reason, |
| 1109 aura::Window* gained_active, | 1107 aura::Window* gained_active, |
| 1110 aura::Window* lost_active) { | 1108 aura::Window* lost_active) { |
| 1111 if (gained_active) | 1109 if (gained_active) |
| 1112 target_root_window_ = gained_active->GetRootWindow(); | 1110 target_root_window_ = gained_active->GetRootWindow(); |
| 1113 } | 1111 } |
| 1114 | 1112 |
| 1115 } // namespace ash | 1113 } // namespace ash |
| OLD | NEW |