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

Unified Diff: ui/views/corewm/window_animations.cc

Issue 130893009: Don't animate child windows if animations are disabled in Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/window_animations.cc
===================================================================
--- ui/views/corewm/window_animations.cc (revision 248236)
+++ ui/views/corewm/window_animations.cc (working copy)
@@ -27,6 +27,7 @@
#include "ui/compositor/layer_animation_sequence.h"
#include "ui/compositor/layer_animator.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/gfx/animation/animation.h"
#include "ui/gfx/interpolated_transform.h"
#include "ui/gfx/rect_conversions.h"
#include "ui/gfx/screen.h"
@@ -567,10 +568,10 @@
}
bool WindowAnimationsDisabled(aura::Window* window) {
- return (window &&
+ return (!gfx::Animation::ShouldRenderRichAnimation() || (window &&
window->GetProperty(aura::client::kAnimationsDisabledKey)) ||
CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kWindowAnimationsDisabled);
+ switches::kWindowAnimationsDisabled));
}
} // namespace corewm
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698