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

Side by Side Diff: ash/common/frame/header_painter_util.cc

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Clean up include and modify comment. Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « ash/common/frame/custom_frame_view_ash.cc ('k') | ash/common/frame/header_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/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 "ash/common/wm_lookup.h"
10 #include "ash/common/wm_window.h" 9 #include "ash/common/wm_window.h"
11 #include "ui/compositor/layer.h" 10 #include "ui/compositor/layer.h"
12 #include "ui/compositor/layer_animator.h" 11 #include "ui/compositor/layer_animator.h"
13 #include "ui/gfx/font_list.h" 12 #include "ui/gfx/font_list.h"
14 #include "ui/gfx/geometry/rect.h" 13 #include "ui/gfx/geometry/rect.h"
15 #include "ui/views/view.h" 14 #include "ui/views/view.h"
16 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
17 16
18 namespace { 17 namespace {
19 18
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 75
77 // static 76 // static
78 bool HeaderPainterUtil::CanAnimateActivation(views::Widget* widget) { 77 bool HeaderPainterUtil::CanAnimateActivation(views::Widget* widget) {
79 // Do not animate the header if the parent (e.g. 78 // Do not animate the header if the parent (e.g.
80 // kShellWindowId_DefaultContainer) is already animating. All of the 79 // kShellWindowId_DefaultContainer) is already animating. All of the
81 // implementers of HeaderPainter animate activation by continuously painting 80 // implementers of HeaderPainter animate activation by continuously painting
82 // during the animation. This gives the parent's animation a slower frame 81 // during the animation. This gives the parent's animation a slower frame
83 // rate. 82 // rate.
84 // TODO(sky): Expose a better way to determine this rather than assuming the 83 // TODO(sky): Expose a better way to determine this rather than assuming the
85 // parent is a toplevel container. 84 // parent is a toplevel container.
86 WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget); 85 WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
87 // TODO(sky): GetParent()->GetLayer() is for mash until animations ported. 86 // TODO(sky): GetParent()->GetLayer() is for mash until animations ported.
88 if (!window || !window->GetParent() || !window->GetParent()->GetLayer()) 87 if (!window || !window->GetParent() || !window->GetParent()->GetLayer())
89 return true; 88 return true;
90 89
91 ui::LayerAnimator* parent_layer_animator = 90 ui::LayerAnimator* parent_layer_animator =
92 window->GetParent()->GetLayer()->GetAnimator(); 91 window->GetParent()->GetLayer()->GetAnimator();
93 return !parent_layer_animator->IsAnimatingProperty( 92 return !parent_layer_animator->IsAnimatingProperty(
94 ui::LayerAnimationElement::OPACITY) && 93 ui::LayerAnimationElement::OPACITY) &&
95 !parent_layer_animator->IsAnimatingProperty( 94 !parent_layer_animator->IsAnimatingProperty(
96 ui::LayerAnimationElement::VISIBILITY); 95 ui::LayerAnimationElement::VISIBILITY);
97 } 96 }
98 97
99 } // namespace ash 98 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/frame/custom_frame_view_ash.cc ('k') | ash/common/frame/header_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698