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

Side by Side Diff: ash/frame/header_painter.h

Issue 199283004: Fixes bugs wrt to painting window header (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/frame/header_painter.cc » ('j') | ash/frame/header_painter.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_FRAME_HEADER_PAINTER_H_ 5 #ifndef ASH_FRAME_HEADER_PAINTER_H_
6 #define ASH_FRAME_HEADER_PAINTER_H_ 6 #define ASH_FRAME_HEADER_PAINTER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 // Called when the browser theme changes. 123 // Called when the browser theme changes.
124 void OnThemeChanged(); 124 void OnThemeChanged();
125 125
126 // Overridden from gfx::AnimationDelegate 126 // Overridden from gfx::AnimationDelegate
127 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 127 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
128 128
129 private: 129 private:
130 FRIEND_TEST_ALL_PREFIXES(HeaderPainterTest, TitleIconAlignment); 130 FRIEND_TEST_ALL_PREFIXES(HeaderPainterTest, TitleIconAlignment);
131 131
132 // Paints the border around the header. 132 // Paints highlight around the edge of the header for restored browser
133 void PaintBorder(gfx::Canvas* canvas, Mode mode); 133 // windows.
134 void PaintHighlightForRestoredBrowserWindow(gfx::Canvas* canvas);
135
136 // Paints highlight around the edge of the header for inactive non-browser
137 // windows.
138 void PaintHighlightForInactiveRestoredWindow(gfx::Canvas* canvas);
134 139
135 // Updates the images used for the minimize, restore and close buttons. 140 // Updates the images used for the minimize, restore and close buttons.
136 void UpdateCaptionButtonImages(); 141 void UpdateCaptionButtonImages();
137 142
138 // Returns the header bounds in the coordinates of |header_view_|. The header 143 // Returns the header bounds in the coordinates of |header_view_|. The header
139 // is assumed to be positioned at the top left corner of |header_view_| and to 144 // is assumed to be positioned at the top left corner of |header_view_| and to
140 // have the same width as |header_view_|. 145 // have the same width as |header_view_|.
141 gfx::Rect GetHeaderLocalBounds() const; 146 gfx::Rect GetHeaderLocalBounds() const;
142 147
143 // Returns the offset between window left edge and title string. 148 // Returns the offset between window left edge and title string.
(...skipping 30 matching lines...) Expand all
174 int crossfade_theme_frame_overlay_id_; 179 int crossfade_theme_frame_overlay_id_;
175 180
176 scoped_ptr<gfx::SlideAnimation> crossfade_animation_; 181 scoped_ptr<gfx::SlideAnimation> crossfade_animation_;
177 182
178 DISALLOW_COPY_AND_ASSIGN(HeaderPainter); 183 DISALLOW_COPY_AND_ASSIGN(HeaderPainter);
179 }; 184 };
180 185
181 } // namespace ash 186 } // namespace ash
182 187
183 #endif // ASH_FRAME_HEADER_PAINTER_H_ 188 #endif // ASH_FRAME_HEADER_PAINTER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/frame/header_painter.cc » ('j') | ash/frame/header_painter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698