| 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/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 FinalizeAnimation(); | 135 FinalizeAnimation(); |
| 136 } | 136 } |
| 137 | 137 |
| 138 // static | 138 // static |
| 139 bool UserSwitchAnimatorChromeOS::CoversScreen(aura::Window* window) { | 139 bool UserSwitchAnimatorChromeOS::CoversScreen(aura::Window* window) { |
| 140 // Full screen covers the screen naturally. Since a normal window can have the | 140 // Full screen covers the screen naturally. Since a normal window can have the |
| 141 // same size as the work area, we only compare the bounds against the work | 141 // same size as the work area, we only compare the bounds against the work |
| 142 // area. | 142 // area. |
| 143 if (ash::wm::GetWindowState(window)->IsFullscreen()) | 143 if (ash::wm::GetWindowState(window)->IsFullscreen()) |
| 144 return true; | 144 return true; |
| 145 gfx::Rect bounds = window->GetBoundsInRootWindow(); | 145 gfx::Rect bounds = window->GetBoundsInScreen(); |
| 146 gfx::Rect work_area = | 146 gfx::Rect work_area = |
| 147 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area(); | 147 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area(); |
| 148 bounds.Intersect(work_area); | 148 bounds.Intersect(work_area); |
| 149 return work_area == bounds; | 149 return work_area == bounds; |
| 150 } | 150 } |
| 151 | 151 |
| 152 void UserSwitchAnimatorChromeOS::AdvanceUserTransitionAnimation() { | 152 void UserSwitchAnimatorChromeOS::AdvanceUserTransitionAnimation() { |
| 153 DCHECK_NE(animation_step_, ANIMATION_STEP_ENDED); | 153 DCHECK_NE(animation_step_, ANIMATION_STEP_ENDED); |
| 154 | 154 |
| 155 TransitionWallpaper(animation_step_); | 155 TransitionWallpaper(animation_step_); |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 if (itr != window_to_entry_map.end()) { | 433 if (itr != window_to_entry_map.end()) { |
| 434 windows_by_account_id_[itr->second->show_for_user()].push_back( | 434 windows_by_account_id_[itr->second->show_for_user()].push_back( |
| 435 child_window); | 435 child_window); |
| 436 } | 436 } |
| 437 } | 437 } |
| 438 } | 438 } |
| 439 } | 439 } |
| 440 } | 440 } |
| 441 | 441 |
| 442 } // namespace chrome | 442 } // namespace chrome |
| OLD | NEW |