Chromium Code Reviews| 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,6 +568,8 @@ |
| } |
| bool WindowAnimationsDisabled(aura::Window* window) { |
| + if (!gfx::Animation::ShouldRenderRichAnimation()) |
|
sky
2014/02/03 04:40:46
nit: combine into single return statement.
ananta
2014/02/03 19:51:07
Done.
|
| + return true; |
| return (window && |
| window->GetProperty(aura::client::kAnimationsDisabledKey)) || |
| CommandLine::ForCurrentProcess()->HasSwitch( |