diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 20:18:10 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 20:18:10 +0000 |
| commit | 0e87499636d0b3267193cf2ce24a41c6f527cb15 (patch) | |
| tree | 61577dc611950d1aa1154f47ff61766d3acc3a07 /ash/wm/panels | |
| parent | a9df3b4b47675f73dc8acedae3ae2024a421cfc9 (diff) | |
| download | chromium_src-0e87499636d0b3267193cf2ce24a41c6f527cb15.zip chromium_src-0e87499636d0b3267193cf2ce24a41c6f527cb15.tar.gz chromium_src-0e87499636d0b3267193cf2ce24a41c6f527cb15.tar.bz2 | |
This CL:
- Makes app windows and browser windows use different assets for the header and window controls
- Removes the separator for the window controls
- Changes FrameCaptionButton so that the buttons use separate assets for the button background and the button icon.
BUG=297187
TEST=Visual by kuscher@
R=jamescook@chromium.org
Review URL: https://codereview.chromium.org/178193004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/panels')
| -rw-r--r-- | ash/wm/panels/panel_frame_view.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc index ee711d7..73d10b4 100644 --- a/ash/wm/panels/panel_frame_view.cc +++ b/ash/wm/panels/panel_frame_view.cc @@ -115,18 +115,19 @@ void PanelFrameView::OnPaint(gfx::Canvas* canvas) { if (!header_painter_) return; bool paint_as_active = ShouldPaintAsActive(); + caption_button_container_->SetPaintAsActive(paint_as_active); + int theme_frame_id = 0; if (paint_as_active) - theme_frame_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE; + theme_frame_id = IDR_AURA_WINDOW_HEADER_BASE_ACTIVE; else - theme_frame_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE; + theme_frame_id = IDR_AURA_WINDOW_HEADER_BASE_INACTIVE; - header_painter_->PaintHeader( - canvas, - theme_frame_id, - 0); + HeaderPainter::Mode header_mode = paint_as_active ? + HeaderPainter::MODE_ACTIVE : HeaderPainter::MODE_INACTIVE; + header_painter_->PaintHeader(canvas, header_mode, theme_frame_id, 0); header_painter_->PaintTitleBar(canvas, title_font_list_); - header_painter_->PaintHeaderContentSeparator(canvas); + header_painter_->PaintHeaderContentSeparator(canvas, header_mode); } gfx::Rect PanelFrameView::GetBoundsForClientView() const { |