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

Unified Diff: ash/frame/default_header_painter.h

Issue 934503002: Ash frames: dark frames now use white caption buttons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/frame/caption_buttons/frame_size_button_unittest.cc ('k') | ash/frame/default_header_painter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/default_header_painter.h
diff --git a/ash/frame/default_header_painter.h b/ash/frame/default_header_painter.h
index 1c5f9799c03beec9e3a2f9d2bdf8dec9a6b8c5b2..662d4c116ca62806abe32422db47ef163a381394 100644
--- a/ash/frame/default_header_painter.h
+++ b/ash/frame/default_header_painter.h
@@ -57,6 +57,7 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
private:
FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment);
+ FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, LightIcons);
// gfx::AnimationDelegate override:
void AnimationProgressed(const gfx::Animation* animation) override;
@@ -74,8 +75,15 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
// Layout the left header view.
void LayoutLeftHeaderView();
+ // Whether light caption images should be used. This is the case when the
+ // background of the frame is dark.
+ bool ShouldUseLightImages();
+
+ // Update all the images in the caption buttons.
+ void UpdateAllButtonImages();
+
// Updates the size button's images.
- void UpdateSizeButtonImages();
+ void UpdateSizeButtonImages(bool use_light_images);
// Returns the header bounds in the coordinates of |view_|. The header is
// assumed to be positioned at the top left corner of |view_| and to have the
« no previous file with comments | « ash/frame/caption_buttons/frame_size_button_unittest.cc ('k') | ash/frame/default_header_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698