Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(253)

Side by Side Diff: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 // static 137 // static
138 bool UserSwitchAnimatorChromeOS::CoversScreen(aura::Window* window) { 138 bool UserSwitchAnimatorChromeOS::CoversScreen(aura::Window* window) {
139 // Full screen covers the screen naturally. Since a normal window can have the 139 // Full screen covers the screen naturally. Since a normal window can have the
140 // same size as the work area, we only compare the bounds against the work 140 // same size as the work area, we only compare the bounds against the work
141 // area. 141 // area.
142 if (ash::wm::GetWindowState(window)->IsFullscreen()) 142 if (ash::wm::GetWindowState(window)->IsFullscreen())
143 return true; 143 return true;
144 gfx::Rect bounds = window->GetBoundsInRootWindow(); 144 gfx::Rect bounds = window->GetBoundsInRootWindow();
145 gfx::Rect work_area = 145 gfx::Rect work_area =
146 gfx::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area(); 146 display::Screen::GetScreen()->GetDisplayNearestWindow(window).work_area();
147 bounds.Intersect(work_area); 147 bounds.Intersect(work_area);
148 return work_area == bounds; 148 return work_area == bounds;
149 } 149 }
150 150
151 void UserSwitchAnimatorChromeOS::AdvanceUserTransitionAnimation() { 151 void UserSwitchAnimatorChromeOS::AdvanceUserTransitionAnimation() {
152 DCHECK_NE(animation_step_, ANIMATION_STEP_ENDED); 152 DCHECK_NE(animation_step_, ANIMATION_STEP_ENDED);
153 153
154 TransitionWallpaper(animation_step_); 154 TransitionWallpaper(animation_step_);
155 TransitionUserShelf(animation_step_); 155 TransitionUserShelf(animation_step_);
156 TransitionWindows(animation_step_); 156 TransitionWindows(animation_step_);
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc ('k') | chrome/browser/ui/ash/window_positioner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698