Use white header for app windows part #2

ash/wm/header_painter.h

 // 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.
 
 #ifndef ASH_WM_HEADER_PAINTER_H_
 #define ASH_WM_HEADER_PAINTER_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"  // OVERRIDE
@@ skipping 14 matching lines @@
 class View;
 class Widget;
 }
 
 namespace ash {
 class FrameCaptionButtonContainerView;
 
 // Helper class for painting the window header.
 class ASH_EXPORT HeaderPainter : public gfx::AnimationDelegate {
  public:
+  enum Mode {

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

Maybe comment that this is the window active state.

+    MODE_ACTIVE,
+    MODE_INACTIVE
+  };
+
   // TODO(pkotwicz): Move code related to "browser" windows out of ash.
   enum Style {
     // Header style used for browser windows.
     STYLE_BROWSER,
 
     // Header style used for apps and miscellaneous windows (e.g. task manager).
     STYLE_OTHER
   };
 
   HeaderPainter();
@@ skipping 31 matching lines @@
 
   // Returns the inset from the right edge.
   int GetRightInset() const;
 
   // Returns the amount that the theme background should be inset.
   int GetThemeBackgroundXInset() const;
 
   // Paints the header.
   // |theme_frame_overlay_id| is 0 if no overlay image should be used.
   void PaintHeader(gfx::Canvas* canvas,
+                   Mode mode,
                    int theme_frame_id,
                    int theme_frame_overlay_id);
 
-  // Paints the header/content separator line. Exists as a separate function
-  // because some windows with complex headers (e.g. browsers with tab strips)
-  // need to draw their own line.
-  void PaintHeaderContentSeparator(gfx::Canvas* canvas);
+  // Paints the header/content separator line for non-browser windows.
+  void PaintHeaderContentSeparator(gfx::Canvas* canvas, Mode mode);
 
-  // Returns size of the header/content separator line in pixels.
+  // Returns size of the header/content separator line for non-browser windows
+  // in pixels.
   int HeaderContentSeparatorSize() const;
 
   // Paint the title bar, primarily the title string.
   void PaintTitleBar(gfx::Canvas* canvas, const gfx::FontList& title_font_list);
 
   // Performs layout for the header based on |frame_|'s show state.
   void LayoutHeader();
 
   // Sets the height of the header. The height of the header affects painting,
   // and non client hit tests. It does not affect layout.
@@ skipping 11 matching lines @@
 
   // Called when the browser theme changes.
   void OnThemeChanged();
 
   // Overridden from gfx::AnimationDelegate
   virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(HeaderPainterTest, TitleIconAlignment);
 
+  // Paints the border around the header.
+  void PaintBorder(gfx::Canvas* canvas, Mode mode);
+
   // Updates the images used for the minimize, restore and close buttons.
   void UpdateCaptionButtonImages();
 
   // Returns the header bounds in the coordinates of |header_view_|. The header
   // is assumed to be positioned at the top left corner of |header_view_| and to
   // have the same width as |header_view_|.
   gfx::Rect GetHeaderLocalBounds() const;
 
   // Returns the offset between window left edge and title string.
   int GetTitleOffsetX() const;
@@ skipping 13 matching lines @@
 
   // Not owned
   views::Widget* frame_;
   views::View* header_view_;
   views::View* window_icon_;  // May be NULL.
   FrameCaptionButtonContainerView* caption_button_container_;
 
   // The height of the header.
   int header_height_;
 
-  // Window frame header/caption parts.
-  const gfx::ImageSkia* top_left_corner_;
-  const gfx::ImageSkia* top_edge_;
-  const gfx::ImageSkia* top_right_corner_;
-  const gfx::ImageSkia* header_left_edge_;
-  const gfx::ImageSkia* header_right_edge_;
-
   // Image ids and opacity last used for painting header.
   int previous_theme_frame_id_;
   int previous_theme_frame_overlay_id_;
 
   // Image ids and opacity we are crossfading from.
   int crossfade_theme_frame_id_;
   int crossfade_theme_frame_overlay_id_;
 
   scoped_ptr<gfx::SlideAnimation> crossfade_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(HeaderPainter);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_HEADER_PAINTER_H_