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

Side by Side Diff: ash/common/frame/default_header_painter.h

Issue 2329433003: Revert of [ash-md] Fades overview header in and out (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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/default_header_painter.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 #ifndef ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_ 5 #ifndef ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_
6 #define ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_ 6 #define ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 int GetHeaderHeightForPainting() const override; 48 int GetHeaderHeightForPainting() const override;
49 void SetHeaderHeightForPainting(int height) override; 49 void SetHeaderHeightForPainting(int height) override;
50 void SchedulePaintForTitle() override; 50 void SchedulePaintForTitle() override;
51 51
52 // Sets the left header view for the header. Passing NULL removes the view. 52 // Sets the left header view for the header. Passing NULL removes the view.
53 void UpdateLeftHeaderView(views::View* left_header_view); 53 void UpdateLeftHeaderView(views::View* left_header_view);
54 54
55 // Sets the active and inactive frame colors. Note the inactive frame color 55 // Sets the active and inactive frame colors. Note the inactive frame color
56 // will have some transparency added when the frame is drawn. 56 // will have some transparency added when the frame is drawn.
57 void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color); 57 void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
58 SkColor GetActiveFrameColor() const;
59 SkColor GetInactiveFrameColor() const;
60 58
61 private: 59 private:
62 FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment); 60 FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment);
63 FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, LightIcons); 61 FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, LightIcons);
64 62
65 // gfx::AnimationDelegate override: 63 // gfx::AnimationDelegate override:
66 void AnimationProgressed(const gfx::Animation* animation) override; 64 void AnimationProgressed(const gfx::Animation* animation) override;
67 65
68 // Paints highlight around the edge of the header for inactive restored 66 // Paints highlight around the edge of the header for inactive restored
69 // windows. 67 // windows.
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 bool initial_paint_; 111 bool initial_paint_;
114 112
115 std::unique_ptr<gfx::SlideAnimation> activation_animation_; 113 std::unique_ptr<gfx::SlideAnimation> activation_animation_;
116 114
117 DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter); 115 DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter);
118 }; 116 };
119 117
120 } // namespace ash 118 } // namespace ash
121 119
122 #endif // ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_ 120 #endif // ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_
OLDNEW
« no previous file with comments | « ash/common/frame/custom_frame_view_ash.cc ('k') | ash/common/frame/default_header_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698