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

Side by Side Diff: chrome/browser/ui/views/frame/browser_header_painter_ash.h

Issue 441803004: Introduce new WebApp header style for hosted apps and fizzy apps on ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Real assets, crushed, review feedback Created 6 years, 4 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 | Annotate | Revision Log
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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
7 7
8 #include "ash/frame/header_painter.h" 8 #include "ash/frame/header_painter.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" // OVERRIDE 10 #include "base/compiler_specific.h" // OVERRIDE
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 views::View* window_icon, 42 views::View* window_icon,
43 ash::FrameCaptionButtonContainerView* caption_button_container); 43 ash::FrameCaptionButtonContainerView* caption_button_container);
44 44
45 // ash::HeaderPainter overrides: 45 // ash::HeaderPainter overrides:
46 virtual int GetMinimumHeaderWidth() const OVERRIDE; 46 virtual int GetMinimumHeaderWidth() const OVERRIDE;
47 virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) OVERRIDE; 47 virtual void PaintHeader(gfx::Canvas* canvas, Mode mode) OVERRIDE;
48 virtual void LayoutHeader() OVERRIDE; 48 virtual void LayoutHeader() OVERRIDE;
49 virtual int GetHeaderHeightForPainting() const OVERRIDE; 49 virtual int GetHeaderHeightForPainting() const OVERRIDE;
50 virtual void SetHeaderHeightForPainting(int height) OVERRIDE; 50 virtual void SetHeaderHeightForPainting(int height) OVERRIDE;
51 virtual void SchedulePaintForTitle() OVERRIDE; 51 virtual void SchedulePaintForTitle() OVERRIDE;
52 virtual void UpdateLeftViewXInset(int left_view_x_inset) OVERRIDE;
52 53
53 private: 54 private:
54 // gfx::AnimationDelegate override: 55 // gfx::AnimationDelegate override:
55 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 56 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
56 57
57 // Paints highlight around the edge of the header for restored windows. 58 // Paints highlight around the edge of the header for restored windows.
58 void PaintHighlightForRestoredWindow(gfx::Canvas* canvas); 59 void PaintHighlightForRestoredWindow(gfx::Canvas* canvas);
59 60
60 // Paints the title bar, primarily the title string. 61 // Paints the title bar, primarily the title string.
61 void PaintTitleBar(gfx::Canvas* canvas); 62 void PaintTitleBar(gfx::Canvas* canvas);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 // Whether the header is for a tabbed browser window. 96 // Whether the header is for a tabbed browser window.
96 bool is_tabbed_; 97 bool is_tabbed_;
97 98
98 // Whether the header is for an incognito browser window. 99 // Whether the header is for an incognito browser window.
99 bool is_incognito_; 100 bool is_incognito_;
100 101
101 // The header view. 102 // The header view.
102 views::View* view_; 103 views::View* view_;
103 104
104 views::View* window_icon_; 105 views::View* window_icon_;
106 int left_view_x_inset_;
pkotwicz 2014/08/19 00:17:07 Nit: Rename to window_icon_x_inset_
benwells 2014/08/19 01:42:42 Done.
105 ash::FrameCaptionButtonContainerView* caption_button_container_; 107 ash::FrameCaptionButtonContainerView* caption_button_container_;
106 int painted_height_; 108 int painted_height_;
107 109
108 // Whether the header is painted for the first time. 110 // Whether the header is painted for the first time.
109 bool initial_paint_; 111 bool initial_paint_;
110 112
111 // Whether the header should be painted as active. 113 // Whether the header should be painted as active.
112 Mode mode_; 114 Mode mode_;
113 115
114 scoped_ptr<gfx::SlideAnimation> activation_animation_; 116 scoped_ptr<gfx::SlideAnimation> activation_animation_;
115 117
116 DISALLOW_COPY_AND_ASSIGN(BrowserHeaderPainterAsh); 118 DISALLOW_COPY_AND_ASSIGN(BrowserHeaderPainterAsh);
117 }; 119 };
118 120
119 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 121 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698