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

Unified Diff: ash/wm/session_state_animator.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/screen_dimmer_unittest.cc ('k') | ash/wm/stacking_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/session_state_animator.cc
diff --git a/ash/wm/session_state_animator.cc b/ash/wm/session_state_animator.cc
index 81e3fcc2bc00a8a466270aa456384dd8038a07cf..38091bf1140344406818aa20300897839b3077dd 100644
--- a/ash/wm/session_state_animator.cc
+++ b/ash/wm/session_state_animator.cc
@@ -403,7 +403,7 @@ bool SessionStateAnimator::TestApi::ContainersAreAnimated(
bool SessionStateAnimator::TestApi::RootWindowIsAnimated(AnimationType type)
const {
- aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+ aura::Window* root_window = Shell::GetPrimaryRootWindow();
ui::Layer* layer = root_window->layer();
return IsLayerAnimated(layer, type);
}
@@ -455,7 +455,7 @@ base::TimeDelta SessionStateAnimator::GetDuration(AnimationSpeed speed) {
// Fills |containers| with the containers described by |container_mask|.
void SessionStateAnimator::GetContainers(int container_mask,
aura::Window::Windows* containers) {
- aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+ aura::Window* root_window = Shell::GetPrimaryRootWindow();
containers->clear();
if (container_mask & DESKTOP_BACKGROUND) {
@@ -542,7 +542,7 @@ void SessionStateAnimator::StartAnimationWithObserver(
void SessionStateAnimator::StartGlobalAnimation(AnimationType type,
AnimationSpeed speed) {
- aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
+ aura::Window* root_window = Shell::GetPrimaryRootWindow();
RunAnimationForWindow(root_window, type, speed, NULL);
}
« no previous file with comments | « ash/wm/screen_dimmer_unittest.cc ('k') | ash/wm/stacking_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698