OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/views/corewm/window_animations.h" | 5 #include "ui/wm/core/window_animations.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
(...skipping 10 matching lines...) Expand all Loading... |
26 #include "ui/compositor/layer_animation_observer.h" | 26 #include "ui/compositor/layer_animation_observer.h" |
27 #include "ui/compositor/layer_animation_sequence.h" | 27 #include "ui/compositor/layer_animation_sequence.h" |
28 #include "ui/compositor/layer_animator.h" | 28 #include "ui/compositor/layer_animator.h" |
29 #include "ui/compositor/scoped_layer_animation_settings.h" | 29 #include "ui/compositor/scoped_layer_animation_settings.h" |
30 #include "ui/gfx/animation/animation.h" | 30 #include "ui/gfx/animation/animation.h" |
31 #include "ui/gfx/interpolated_transform.h" | 31 #include "ui/gfx/interpolated_transform.h" |
32 #include "ui/gfx/rect_conversions.h" | 32 #include "ui/gfx/rect_conversions.h" |
33 #include "ui/gfx/screen.h" | 33 #include "ui/gfx/screen.h" |
34 #include "ui/gfx/vector2d.h" | 34 #include "ui/gfx/vector2d.h" |
35 #include "ui/gfx/vector3d_f.h" | 35 #include "ui/gfx/vector3d_f.h" |
36 #include "ui/views/corewm/corewm_switches.h" | 36 #include "ui/wm/core/window_util.h" |
37 #include "ui/views/corewm/window_util.h" | 37 #include "ui/wm/core/wm_core_switches.h" |
38 | 38 |
39 DECLARE_WINDOW_PROPERTY_TYPE(int) | 39 DECLARE_WINDOW_PROPERTY_TYPE(int) |
40 DECLARE_WINDOW_PROPERTY_TYPE(views::corewm::WindowVisibilityAnimationType) | 40 DECLARE_WINDOW_PROPERTY_TYPE(views::corewm::WindowVisibilityAnimationType) |
41 DECLARE_WINDOW_PROPERTY_TYPE(views::corewm::WindowVisibilityAnimationTransition) | 41 DECLARE_WINDOW_PROPERTY_TYPE(views::corewm::WindowVisibilityAnimationTransition) |
42 DECLARE_WINDOW_PROPERTY_TYPE(float) | 42 DECLARE_WINDOW_PROPERTY_TYPE(float) |
43 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT, bool) | 43 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(WM_CORE_EXPORT, bool) |
44 | 44 |
45 using aura::Window; | 45 using aura::Window; |
46 using base::TimeDelta; | 46 using base::TimeDelta; |
47 using ui::Layer; | 47 using ui::Layer; |
48 | 48 |
49 namespace views { | 49 namespace views { |
50 namespace corewm { | 50 namespace corewm { |
51 namespace { | 51 namespace { |
52 const float kWindowAnimation_Vertical_TranslateY = 15.f; | 52 const float kWindowAnimation_Vertical_TranslateY = 15.f; |
53 } // namespace | 53 } // namespace |
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
549 | 549 |
550 bool WindowAnimationsDisabled(aura::Window* window) { | 550 bool WindowAnimationsDisabled(aura::Window* window) { |
551 return (!gfx::Animation::ShouldRenderRichAnimation() || (window && | 551 return (!gfx::Animation::ShouldRenderRichAnimation() || (window && |
552 window->GetProperty(aura::client::kAnimationsDisabledKey)) || | 552 window->GetProperty(aura::client::kAnimationsDisabledKey)) || |
553 CommandLine::ForCurrentProcess()->HasSwitch( | 553 CommandLine::ForCurrentProcess()->HasSwitch( |
554 switches::kWindowAnimationsDisabled)); | 554 switches::kWindowAnimationsDisabled)); |
555 } | 555 } |
556 | 556 |
557 } // namespace corewm | 557 } // namespace corewm |
558 } // namespace views | 558 } // namespace views |
OLD | NEW |