| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h" | 5 #include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h" |
| 6 | 6 |
| 7 #include "ash/desktop_background/user_wallpaper_delegate.h" | 7 #include "ash/desktop_background/user_wallpaper_delegate.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
| 10 #include "ash/shelf/shelf_widget.h" | 10 #include "ash/shelf/shelf_widget.h" |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 // Maximized windows should be hidden, but visually kept visible | 322 // Maximized windows should be hidden, but visually kept visible |
| 323 // in order to prevent showing the background while the animation is | 323 // in order to prevent showing the background while the animation is |
| 324 // in progress. Therefore we detach the old layer and recreate fresh | 324 // in progress. Therefore we detach the old layer and recreate fresh |
| 325 // ones. The old layers will be destructed at the animation step | 325 // ones. The old layers will be destructed at the animation step |
| 326 // |ANIMATION_STEP_FINALIZE|. | 326 // |ANIMATION_STEP_FINALIZE|. |
| 327 // old_layers_.push_back(wm::RecreateLayers(window)); | 327 // old_layers_.push_back(wm::RecreateLayers(window)); |
| 328 // We only want to do this for the first (foreground) maximized | 328 // We only want to do this for the first (foreground) maximized |
| 329 // window we encounter. | 329 // window we encounter. |
| 330 found_foreground_maximized_window = true; | 330 found_foreground_maximized_window = true; |
| 331 ui::LayerTreeOwner* old_layer = | 331 ui::LayerTreeOwner* old_layer = |
| 332 wm::RecreateLayers(window).release(); | 332 wm::RecreateLayers(window, nullptr).release(); |
| 333 window->layer()->parent()->StackAtBottom(old_layer->root()); | 333 window->layer()->parent()->StackAtBottom(old_layer->root()); |
| 334 new MaximizedWindowAnimationWatcher(window->layer()->GetAnimator(), | 334 new MaximizedWindowAnimationWatcher(window->layer()->GetAnimator(), |
| 335 old_layer); | 335 old_layer); |
| 336 } | 336 } |
| 337 | 337 |
| 338 owner_->SetWindowVisibility(window, false, duration); | 338 owner_->SetWindowVisibility(window, false, duration); |
| 339 } | 339 } |
| 340 } | 340 } |
| 341 | 341 |
| 342 // Show new user. | 342 // Show new user. |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 if (itr != window_to_entry_map.end()) { | 432 if (itr != window_to_entry_map.end()) { |
| 433 windows_by_account_id_[itr->second->show_for_user()].push_back( | 433 windows_by_account_id_[itr->second->show_for_user()].push_back( |
| 434 child_window); | 434 child_window); |
| 435 } | 435 } |
| 436 } | 436 } |
| 437 } | 437 } |
| 438 } | 438 } |
| 439 } | 439 } |
| 440 | 440 |
| 441 } // namespace chrome | 441 } // namespace chrome |
| OLD | NEW |