| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 UserSwitchAnimatorChromeOS::UserSwitchAnimatorChromeOS( | 104 UserSwitchAnimatorChromeOS::UserSwitchAnimatorChromeOS( |
| 105 MultiUserWindowManagerChromeOS* owner, | 105 MultiUserWindowManagerChromeOS* owner, |
| 106 const AccountId& new_account_id, | 106 const AccountId& new_account_id, |
| 107 int animation_speed_ms) | 107 int animation_speed_ms) |
| 108 : owner_(owner), | 108 : owner_(owner), |
| 109 new_account_id_(new_account_id), | 109 new_account_id_(new_account_id), |
| 110 animation_speed_ms_(animation_speed_ms), | 110 animation_speed_ms_(animation_speed_ms), |
| 111 animation_step_(ANIMATION_STEP_HIDE_OLD_USER), | 111 animation_step_(ANIMATION_STEP_HIDE_OLD_USER), |
| 112 screen_cover_(GetScreenCover(NULL)), | 112 screen_cover_(GetScreenCover(NULL)), |
| 113 windows_by_account_id_() { | 113 windows_by_account_id_() { |
| 114 ash::Shell::GetInstance()->DismissAppList(); |
| 114 BuildUserToWindowsListMap(); | 115 BuildUserToWindowsListMap(); |
| 115 AdvanceUserTransitionAnimation(); | 116 AdvanceUserTransitionAnimation(); |
| 116 | 117 |
| 117 if (!animation_speed_ms_) { | 118 if (!animation_speed_ms_) { |
| 118 FinalizeAnimation(); | 119 FinalizeAnimation(); |
| 119 } else { | 120 } else { |
| 120 user_changed_animation_timer_.reset(new base::Timer( | 121 user_changed_animation_timer_.reset(new base::Timer( |
| 121 FROM_HERE, | 122 FROM_HERE, |
| 122 base::TimeDelta::FromMilliseconds(animation_speed_ms_), | 123 base::TimeDelta::FromMilliseconds(animation_speed_ms_), |
| 123 base::Bind( | 124 base::Bind( |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 if (itr != window_to_entry_map.end()) { | 447 if (itr != window_to_entry_map.end()) { |
| 447 windows_by_account_id_[itr->second->show_for_user()].push_back( | 448 windows_by_account_id_[itr->second->show_for_user()].push_back( |
| 448 child_window); | 449 child_window); |
| 449 } | 450 } |
| 450 } | 451 } |
| 451 } | 452 } |
| 452 } | 453 } |
| 453 } | 454 } |
| 454 | 455 |
| 455 } // namespace chrome | 456 } // namespace chrome |
| OLD | NEW |