Use white header for app windows part #2

ash/wm/header_painter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/header_painter.h"
 
 #include <vector>
 
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 25 matching lines @@
 // Space between the title text and the caption buttons.
 const int kTitleLogoSpacing = 5;
 // Space between window icon and title text.
 const int kTitleIconOffsetX = 5;
 // Space between window edge and title text, when there is no icon.
 const int kTitleNoIconOffsetX = 8;
 // Color for the non-maximized window title text.
 const SkColor kNonMaximizedWindowTitleTextColor = SkColorSetRGB(40, 40, 40);
 // Color for the maximized window title text.
 const SkColor kMaximizedWindowTitleTextColor = SK_ColorWHITE;
-// Size of header/content separator line below the header image.
+// Size of header/content separator line below the header image for non-browser
+// windows.
 const int kHeaderContentSeparatorSize = 1;
-// Color of header bottom edge line.
-const SkColor kHeaderContentSeparatorColor = SkColorSetRGB(128, 128, 128);
+// Color of the active window header/content separator line for non-browser
+// windows.
+const SkColor kHeaderContentSeparatorColor = SkColorSetRGB(180, 180, 182);
+// Color of the inactive window header/content separator line for non-browser
+// windows.
+const SkColor kHeaderContentSeparatorInactiveColor =
+    SkColorSetRGB(150, 150, 152);
 // In the pre-Ash era the web content area had a frame along the left edge, so
 // user-generated theme images for the new tab page assume they are shifted
 // right relative to the header.  Now that we have removed the left edge frame
 // we need to copy the theme image for the window header from a few pixels
 // inset to preserve alignment with the NTP image, or else we'll break a bunch
 // of existing themes.  We do something similar on OS X for the same reason.
 const int kThemeFrameImageInsetX = 5;
 // Duration of crossfade animation for activating and deactivating frame.
 const int kActivationCrossfadeDurationMs = 200;
 
@@ skipping 72 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // HeaderPainter, public:
 
 HeaderPainter::HeaderPainter()
     : frame_(NULL),
       header_view_(NULL),
       window_icon_(NULL),
       caption_button_container_(NULL),
       header_height_(0),
-      top_left_corner_(NULL),
-      top_edge_(NULL),
-      top_right_corner_(NULL),
-      header_left_edge_(NULL),
-      header_right_edge_(NULL),
       previous_theme_frame_id_(0),
       previous_theme_frame_overlay_id_(0),
       crossfade_theme_frame_id_(0),
       crossfade_theme_frame_overlay_id_(0) {}
 
 HeaderPainter::~HeaderPainter() {
 }
 
 void HeaderPainter::Init(
     Style style,
     views::Widget* frame,
     views::View* header_view,
     views::View* window_icon,
     FrameCaptionButtonContainerView* caption_button_container) {
   DCHECK(frame);
   DCHECK(header_view);
   // window_icon may be NULL.
   DCHECK(caption_button_container);
   style_ = style;
   frame_ = frame;
   header_view_ = header_view;
   window_icon_ = window_icon;
   caption_button_container_ = caption_button_container;
-
-  // Window frame image parts.
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  top_left_corner_ =
-      rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT).ToImageSkia();
-  top_edge_ =
-      rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_TOP).ToImageSkia();
-  top_right_corner_ =
-      rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT).ToImageSkia();
-  header_left_edge_ =
-      rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_LEFT).ToImageSkia();
-  header_right_edge_ =
-      rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_RIGHT).ToImageSkia();
 }
 
 // static
 gfx::Rect HeaderPainter::GetBoundsForClientView(
     int header_height,
     const gfx::Rect& window_bounds) {
   gfx::Rect client_bounds(window_bounds);
   client_bounds.Inset(0, header_height, 0, 0);
   return client_bounds;
 }
@@ skipping 36 matching lines @@
 
 int HeaderPainter::GetRightInset() const {
   return caption_button_container_->GetPreferredSize().width();
 }
 
 int HeaderPainter::GetThemeBackgroundXInset() const {
   return kThemeFrameImageInsetX;
 }
 
 void HeaderPainter::PaintHeader(gfx::Canvas* canvas,
+                                Mode mode,
                                 int theme_frame_id,
                                 int theme_frame_overlay_id) {
   bool initial_paint = (previous_theme_frame_id_ == 0);
   if (!initial_paint &&
       (previous_theme_frame_id_ != theme_frame_id ||
        previous_theme_frame_overlay_id_ != theme_frame_overlay_id)) {
     aura::Window* parent = frame_->GetNativeWindow()->parent();
     // Don't animate the header if the parent (a workspace) is already
     // animating. Doing so results in continually painting during the animation
     // and gives a slower frame rate.
@@ skipping 65 matching lines @@
                               theme_frame,
                               theme_frame_overlay,
                               paint,
                               GetHeaderLocalBounds(),
                               corner_radius,
                               GetThemeBackgroundXInset());
 
   previous_theme_frame_id_ = theme_frame_id;
   previous_theme_frame_overlay_id_ = theme_frame_overlay_id;
 
-  // We don't need the extra lightness in the edges when the window is maximized
-  // or fullscreen.
-  if (frame_->IsMaximized() || frame_->IsFullscreen())
-    return;
-
-  // Draw the top corners and edge.
-  int top_left_width = top_left_corner_->width();
-  int top_left_height = top_left_corner_->height();
-  canvas->DrawImageInt(*top_left_corner_,
-                       0, 0, top_left_width, top_left_height,
-                       0, 0, top_left_width, top_left_height,
-                       false);
-  canvas->TileImageInt(*top_edge_,
-      top_left_width,
-      0,
-      header_view_->width() - top_left_width - top_right_corner_->width(),
-      top_edge_->height());
-  int top_right_height = top_right_corner_->height();
-  canvas->DrawImageInt(*top_right_corner_,
-                       0, 0,
-                       top_right_corner_->width(), top_right_height,
-                       header_view_->width() - top_right_corner_->width(), 0,
-                       top_right_corner_->width(), top_right_height,
-                       false);
-
-  // Header left edge.
-  int header_left_height = theme_frame->height() - top_left_height;
-  canvas->TileImageInt(*header_left_edge_,
-                       0, top_left_height,
-                       header_left_edge_->width(), header_left_height);
-
-  // Header right edge.
-  int header_right_height = theme_frame->height() - top_right_height;
-  canvas->TileImageInt(*header_right_edge_,
-                       header_view_->width() - header_right_edge_->width(),
-                       top_right_height,
-                       header_right_edge_->width(),
-                       header_right_height);
-
-  // We don't draw edges around the content area.  Web content goes flush
-  // to the edge of the window.
+  PaintBorder(canvas, mode);
 }
 
-void HeaderPainter::PaintHeaderContentSeparator(gfx::Canvas* canvas) {
+void HeaderPainter::PaintHeaderContentSeparator(gfx::Canvas* canvas,
+                                                Mode mode) {
+  DCHECK_EQ(style_, STYLE_OTHER);
+  SkColor color = (mode == MODE_ACTIVE) ?
+      kHeaderContentSeparatorColor :
+      kHeaderContentSeparatorInactiveColor;
   canvas->FillRect(gfx::Rect(0,
                              header_height_ - kHeaderContentSeparatorSize,
                              header_view_->width(),
                              kHeaderContentSeparatorSize),
-                   kHeaderContentSeparatorColor);
+                   color);
 }
 
 int HeaderPainter::HeaderContentSeparatorSize() const {
   return kHeaderContentSeparatorSize;
 }
 
 void HeaderPainter::PaintTitleBar(gfx::Canvas* canvas,
                                   const gfx::FontList& title_font_list) {
   // The window icon is painted by its own views::View.
   views::WidgetDelegate* delegate = frame_->widget_delegate();
@@ skipping 59 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // gfx::AnimationDelegate overrides:
 
 void HeaderPainter::AnimationProgressed(const gfx::Animation* animation) {
   header_view_->SchedulePaintInRect(GetHeaderLocalBounds());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HeaderPainter, private:
 
+void HeaderPainter::PaintBorder(gfx::Canvas* canvas, Mode mode) {
+  if (frame_->IsMaximized() ||
+      frame_->IsFullscreen() ||
+      (style_ == STYLE_OTHER && mode == MODE_ACTIVE)) {
+    return;
+  }
+
+  gfx::ImageSkia top_left_corner;
+  gfx::ImageSkia top_right_corner;
+  gfx::ImageSkia top_edge;
+  gfx::ImageSkia left_edge;
+  gfx::ImageSkia right_edge;
+  gfx::ImageSkia bottom_edge;
+
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  if (style_ == STYLE_BROWSER) {
+    top_left_corner = *rb.GetImageSkiaNamed(
+        IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT);
+    top_right_corner = *rb.GetImageSkiaNamed(
+        IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT);
+    top_edge = *rb.GetImageSkiaNamed(IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP);
+    left_edge = *rb.GetImageSkiaNamed(
+        IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_LEFT);
+    right_edge = *rb.GetImageSkiaNamed(
+        IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_RIGHT);
+  } else {
+    top_edge = *rb.GetImageSkiaNamed(
+        IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_TOP);
+    left_edge = *rb.GetImageSkiaNamed(
+        IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_LEFT);
+    right_edge = *rb.GetImageSkiaNamed(
+        IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_RIGHT);
+    bottom_edge = *rb.GetImageSkiaNamed(
+        IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_BOTTOM);
+  }
+
+  int top_left_width = top_left_corner.width();
+  int top_left_height = top_left_corner.height();
+  if (!top_left_corner.isNull()) {
+    canvas->DrawImageInt(top_left_corner,
+                         0, 0, top_left_width, top_left_height,
+                         0, 0, top_left_width, top_left_height,
+                         false);
+  }
+
+  int top_right_height = top_right_corner.height();
+  if (!top_right_corner.isNull()) {
+    canvas->DrawImageInt(top_right_corner,
+                         0, 0,
+                         top_right_corner.width(), top_right_height,
+                         header_view_->width() - top_right_corner.width(), 0,
+                         top_right_corner.width(), top_right_height,
+                         false);
+  }
+
+  if (!top_edge.isNull()) {

[James Cook, 2014/02/03 18:46:35]

There's always a top_edge, right?

+    canvas->TileImageInt(top_edge,
+        top_left_width,
+        0,
+        header_view_->width() - top_left_width - top_right_corner.width(),
+        top_edge.height());
+  }
+
+  int bottom_height = bottom_edge.height();
+  if (!bottom_edge.isNull()) {
+    canvas->TileImageInt(bottom_edge,
+        0, header_height_ - bottom_height,
+        header_view_->width(), bottom_edge.height());
+  }
+
+  int left_edge_height = header_height_ - top_left_height - bottom_height;
+  if (!left_edge.isNull()) {

[James Cook, 2014/02/03 18:46:35]

ditto

+    canvas->TileImageInt(left_edge,
+                         0, top_left_height,
+                         left_edge.width(), left_edge_height);
+  }
+
+  int right_edge_height = header_height_ - top_right_height - bottom_height;
+  if (!right_edge.isNull()) {

[James Cook, 2014/02/03 18:46:35]

ditto

+    canvas->TileImageInt(right_edge,
+                         header_view_->width() - right_edge.width(),
+                         top_right_height,
+                         right_edge.width(),
+                         right_edge_height);
+  }
+}
+
 void HeaderPainter::UpdateCaptionButtonImages() {
-  if (frame_->IsMaximized() || frame_->IsFullscreen()) {
+  if (style_ == STYLE_BROWSER) {
+    if (frame_->IsMaximized() || frame_->IsFullscreen()) {
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_MINIMIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_CLOSE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_LEFT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+    } else {
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_MINIMIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_CLOSE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_LEFT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+      caption_button_container_->SetButtonImages(
+          CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+          IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+    }
+  } else {
+    caption_button_container_->SetButtonImages(
+        CAPTION_BUTTON_ICON_MINIMIZE,
+        IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE,
+        IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE_I,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
     caption_button_container_->SetButtonImages(
         CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_H,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_P);
+        IDR_AURA_WINDOW_CONTROL_ICON_SIZE,
+        IDR_AURA_WINDOW_CONTROL_ICON_SIZE_I,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
     caption_button_container_->SetButtonImages(
         CAPTION_BUTTON_ICON_CLOSE,
-        IDR_AURA_WINDOW_MAXIMIZED_CLOSE2,
-        IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_H,
-        IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_P);
+        IDR_AURA_WINDOW_CONTROL_ICON_CLOSE,
+        IDR_AURA_WINDOW_CONTROL_ICON_CLOSE_I,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+
+    // There is no dedicated icon for the snap-left and snap-right buttons
+    // when |frame_| is inactive because they should never be visible while
+    // |frame_| is inactive.
     caption_button_container_->SetButtonImages(
         CAPTION_BUTTON_ICON_LEFT_SNAPPED,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_H,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_P);
+        IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
+        IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
     caption_button_container_->SetButtonImages(
         CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_H,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_P);
-  } else if (style_ == STYLE_BROWSER) {
-    caption_button_container_->SetButtonImages(
-        CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
-        IDR_AURA_WINDOW_MAXIMIZE,
-        IDR_AURA_WINDOW_MAXIMIZE_H,
-        IDR_AURA_WINDOW_MAXIMIZE_P);
-    caption_button_container_->SetButtonImages(
-        CAPTION_BUTTON_ICON_CLOSE,
-        IDR_AURA_WINDOW_CLOSE,
-        IDR_AURA_WINDOW_CLOSE_H,
-        IDR_AURA_WINDOW_CLOSE_P);
-    caption_button_container_->SetButtonImages(
-        CAPTION_BUTTON_ICON_LEFT_SNAPPED,
-        IDR_AURA_WINDOW_MAXIMIZE,
-        IDR_AURA_WINDOW_MAXIMIZE_H,
-        IDR_AURA_WINDOW_MAXIMIZE_P);
-    caption_button_container_->SetButtonImages(
-        CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
-        IDR_AURA_WINDOW_MAXIMIZE,
-        IDR_AURA_WINDOW_MAXIMIZE_H,
-        IDR_AURA_WINDOW_MAXIMIZE_P);
-  } else {
-    caption_button_container_->SetButtonImages(
-        CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P);
-    caption_button_container_->SetButtonImages(
-        CAPTION_BUTTON_ICON_CLOSE,
-        IDR_AURA_WINDOW_MAXIMIZED_CLOSE,
-        IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H,
-        IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P);
-    caption_button_container_->SetButtonImages(
-        CAPTION_BUTTON_ICON_LEFT_SNAPPED,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P);
-    caption_button_container_->SetButtonImages(
-        CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H,
-        IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P);
+        IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
+        IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
+        IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
   }
-
-  caption_button_container_->SetButtonImages(
-      CAPTION_BUTTON_ICON_MINIMIZE,
-      IDR_AURA_WINDOW_MINIMIZE_SHORT,
-      IDR_AURA_WINDOW_MINIMIZE_SHORT_H,
-      IDR_AURA_WINDOW_MINIMIZE_SHORT_P);
 }
 
 gfx::Rect HeaderPainter::GetHeaderLocalBounds() const {
   return gfx::Rect(header_view_->width(), header_height_);
 }
 
 int HeaderPainter::GetTitleOffsetX() const {
   return window_icon_ ?
       window_icon_->bounds().right() + kTitleIconOffsetX :
       kTitleNoIconOffsetX;
@@ skipping 18 matching lines @@
   int title_y =
       GetCaptionButtonContainerCenterY() - title_font_list.GetHeight() / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, caption_button_container_->x() - kTitleLogoSpacing - title_x),
       title_font_list.GetHeight());
 }
 
 }  // namespace ash