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

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

Issue 802473003: Fix references to ui/gfx headers in a*/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/frame/default_header_painter.cc ('k') | ash/host/ash_window_tree_host.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/frame/header_painter_util.h" 5 #include "ash/frame/header_painter_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/compositor/layer.h" 10 #include "ui/compositor/layer.h"
11 #include "ui/compositor/layer_animator.h" 11 #include "ui/compositor/layer_animator.h"
12 #include "ui/gfx/font_list.h" 12 #include "ui/gfx/font_list.h"
13 #include "ui/gfx/rect.h" 13 #include "ui/gfx/geometry/rect.h"
14 #include "ui/views/view.h" 14 #include "ui/views/view.h"
15 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
16 16
17 namespace { 17 namespace {
18 18
19 // Radius of the header's top corners when the window is restored. 19 // Radius of the header's top corners when the window is restored.
20 const int kTopCornerRadiusWhenRestored = 2; 20 const int kTopCornerRadiusWhenRestored = 2;
21 21
22 // Distance between left edge of the window and the leftmost view. 22 // Distance between left edge of the window and the leftmost view.
23 const int kDefaultLeftViewXInset = 9; 23 const int kDefaultLeftViewXInset = 9;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 88
89 ui::LayerAnimator* parent_layer_animator = 89 ui::LayerAnimator* parent_layer_animator =
90 window->parent()->layer()->GetAnimator(); 90 window->parent()->layer()->GetAnimator();
91 return !parent_layer_animator->IsAnimatingProperty( 91 return !parent_layer_animator->IsAnimatingProperty(
92 ui::LayerAnimationElement::OPACITY) && 92 ui::LayerAnimationElement::OPACITY) &&
93 !parent_layer_animator->IsAnimatingProperty( 93 !parent_layer_animator->IsAnimatingProperty(
94 ui::LayerAnimationElement::VISIBILITY); 94 ui::LayerAnimationElement::VISIBILITY);
95 } 95 }
96 96
97 } // namespace ash 97 } // namespace ash
OLDNEW
« no previous file with comments | « ash/frame/default_header_painter.cc ('k') | ash/host/ash_window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698