| OLD | NEW |
| 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 "ash/frame/header_painter_util.h" | 5 #include "ash/common/frame/header_painter_util.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ui/aura/window.h" | 9 #include "ash/common/wm_lookup.h" |
| 10 #include "ash/common/wm_window.h" |
| 10 #include "ui/compositor/layer.h" | 11 #include "ui/compositor/layer.h" |
| 11 #include "ui/compositor/layer_animator.h" | 12 #include "ui/compositor/layer_animator.h" |
| 12 #include "ui/gfx/font_list.h" | 13 #include "ui/gfx/font_list.h" |
| 13 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
| 14 #include "ui/views/view.h" | 15 #include "ui/views/view.h" |
| 15 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
| 16 | 17 |
| 17 namespace { | 18 namespace { |
| 18 | 19 |
| 19 // Radius of the header's top corners when the window is restored. | 20 // Radius of the header's top corners when the window is restored. |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 | 76 |
| 76 // static | 77 // static |
| 77 bool HeaderPainterUtil::CanAnimateActivation(views::Widget* widget) { | 78 bool HeaderPainterUtil::CanAnimateActivation(views::Widget* widget) { |
| 78 // Do not animate the header if the parent (e.g. | 79 // Do not animate the header if the parent (e.g. |
| 79 // kShellWindowId_DefaultContainer) is already animating. All of the | 80 // kShellWindowId_DefaultContainer) is already animating. All of the |
| 80 // implementers of HeaderPainter animate activation by continuously painting | 81 // implementers of HeaderPainter animate activation by continuously painting |
| 81 // during the animation. This gives the parent's animation a slower frame | 82 // during the animation. This gives the parent's animation a slower frame |
| 82 // rate. | 83 // rate. |
| 83 // TODO(sky): Expose a better way to determine this rather than assuming the | 84 // TODO(sky): Expose a better way to determine this rather than assuming the |
| 84 // parent is a toplevel container. | 85 // parent is a toplevel container. |
| 85 aura::Window* window = widget->GetNativeWindow(); | 86 WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget); |
| 86 if (!window->parent()) | 87 if (!window || !window->GetParent()) |
| 87 return true; | 88 return true; |
| 88 | 89 |
| 89 ui::LayerAnimator* parent_layer_animator = | 90 ui::LayerAnimator* parent_layer_animator = |
| 90 window->parent()->layer()->GetAnimator(); | 91 window->GetParent()->GetLayer()->GetAnimator(); |
| 91 return !parent_layer_animator->IsAnimatingProperty( | 92 return !parent_layer_animator->IsAnimatingProperty( |
| 92 ui::LayerAnimationElement::OPACITY) && | 93 ui::LayerAnimationElement::OPACITY) && |
| 93 !parent_layer_animator->IsAnimatingProperty( | 94 !parent_layer_animator->IsAnimatingProperty( |
| 94 ui::LayerAnimationElement::VISIBILITY); | 95 ui::LayerAnimationElement::VISIBILITY); |
| 95 } | 96 } |
| 96 | 97 |
| 97 } // namespace ash | 98 } // namespace ash |
| OLD | NEW |