summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/frame/browser_header_painter_ash.h
diff options
context:
space:
mode:
authortdanderson <tdanderson@chromium.org>2016-01-05 09:50:43 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-05 17:51:41 +0000
commitb161d2c9aab0c7eff442ba9c90303d8bce22880f (patch)
tree6047bce1a4fda488c6170b5f932bab61d317e4db /chrome/browser/ui/views/frame/browser_header_painter_ash.h
parent15dfe4497acc9320e7453e38edec62acbf237716 (diff)
downloadchromium_src-b161d2c9aab0c7eff442ba9c90303d8bce22880f.zip
chromium_src-b161d2c9aab0c7eff442ba9c90303d8bce22880f.tar.gz
chromium_src-b161d2c9aab0c7eff442ba9c90303d8bce22880f.tar.bz2
Do not use assets for Ash window control button backgrounds
Paints the hovered/pressed background colors of the Ash frame caption buttons programmatically and deletes the now-obsolete asset files. Also introduces ash_layout_constants.cc in order to parameterize the constants which have different values for material design; this is used to specify the caption button dimensions which were previously given by assets. BUG=569062 TEST=ash_unittests.* Review URL: https://codereview.chromium.org/1505223004 Cr-Commit-Position: refs/heads/master@{#367566}
Diffstat (limited to 'chrome/browser/ui/views/frame/browser_header_painter_ash.h')
-rw-r--r--chrome/browser/ui/views/frame/browser_header_painter_ash.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.h b/chrome/browser/ui/views/frame/browser_header_painter_ash.h
index 821510b..8d27f54 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.h
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.h
@@ -81,8 +81,9 @@ class BrowserHeaderPainterAsh : public ash::HeaderPainter,
// browser windows and for hosted app windows which show the toolbar.
gfx::ImageSkia GetFrameImageForNonTabbedBrowser(Mode mode) const;
- // Updates the images used for the minimize, restore and close buttons.
- void UpdateCaptionButtonImages();
+ // Updates the size and icons used for the minimize, restore, and close
+ // buttons.
+ void UpdateCaptionButtons();
// Returns bounds of the region in |view_| which is painted with the header
// images. The region is assumed to start at the top left corner of |view_|