Support chrome app frame colors on ChromeOS.

ash/frame/default_header_painter.cc

 // Copyright 2014 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/frame/default_header_painter.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/header_painter_util.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 17 matching lines @@
 
 namespace {
 
 // Color for the window title text.
 const SkColor kTitleTextColor = SkColorSetRGB(40, 40, 40);
 // Color of the active window header/content separator line.
 const SkColor kHeaderContentSeparatorColor = SkColorSetRGB(150, 150, 152);
 // Color of the inactive window header/content separator line.
 const SkColor kHeaderContentSeparatorInactiveColor =
     SkColorSetRGB(180, 180, 182);
 // The color of the frame.

[pkotwicz, 2014/10/16 23:21:22]

Nit: The default color of the frame.

-const SkColor kFrameColor = SkColorSetRGB(242, 242, 242);
+const SkColor kDefaultFrameColor = SkColorSetRGB(242, 242, 242);
 // The alpha of the inactive frame.
 const SkAlpha kInactiveFrameAlpha = 204;
 // Duration of crossfade animation for activating and deactivating frame.
 const int kActivationCrossfadeDurationMs = 200;
 
 // Tiles an image into an area, rounding the top corners.
 void TileRoundRect(gfx::Canvas* canvas,
                    const SkPaint& paint,
                    const gfx::Rect& bounds,
                    int corner_radius) {
@@ skipping 22 matching lines @@
 namespace ash {
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, public:
 
 DefaultHeaderPainter::DefaultHeaderPainter()
     : frame_(NULL),
       view_(NULL),
       left_header_view_(NULL),
       left_view_x_inset_(HeaderPainterUtil::GetDefaultLeftViewXInset()),
+      active_frame_color_(kDefaultFrameColor),
+      inactive_frame_color_(kDefaultFrameColor),
       caption_button_container_(NULL),
       height_(0),
       mode_(MODE_INACTIVE),
       initial_paint_(true),
       activation_animation_(new gfx::SlideAnimation(this)) {
 }
 
 DefaultHeaderPainter::~DefaultHeaderPainter() {
 }
 
@@ skipping 65 matching lines @@
     }
     initial_paint_ = false;
   }
 
   int corner_radius = (frame_->IsMaximized() || frame_->IsFullscreen()) ?
       0 : HeaderPainterUtil::GetTopCornerRadiusWhenRestored();
 
   SkPaint paint;
   int active_alpha = activation_animation_->CurrentValueBetween(0, 255);
   paint.setColor(color_utils::AlphaBlend(
-      kFrameColor, GetInactiveFrameColor(), active_alpha));
+      active_frame_color_, GetInactiveFrameColor(), active_alpha));
 
   TileRoundRect(canvas, paint, GetLocalBounds(), corner_radius);
 
   if (!frame_->IsMaximized() &&
       !frame_->IsFullscreen() &&
       mode_ == MODE_INACTIVE) {
     PaintHighlightForInactiveRestoredWindow(canvas);
   }
   if (frame_->widget_delegate() &&
       frame_->widget_delegate()->ShouldShowWindowTitle()) {
@@ skipping 32 matching lines @@
   view_->SchedulePaintInRect(GetTitleBounds());
 }
 
 void DefaultHeaderPainter::UpdateLeftViewXInset(int left_view_x_inset) {
   if (left_view_x_inset_ != left_view_x_inset) {
     left_view_x_inset_ = left_view_x_inset;
     LayoutLeftHeaderView();
   }
 }
 
+void DefaultHeaderPainter::SetFrameColors(SkColor active_frame_color,
+                                          SkColor inactive_frame_color) {
+  active_frame_color_ = active_frame_color;
+  inactive_frame_color_ = inactive_frame_color;
+}
+
 void DefaultHeaderPainter::UpdateLeftHeaderView(views::View* left_header_view) {
   left_header_view_ = left_header_view;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // gfx::AnimationDelegate overrides:
 
 void DefaultHeaderPainter::AnimationProgressed(
     const gfx::Animation* animation) {
   view_->SchedulePaintInRect(GetLocalBounds());
@@ skipping 96 matching lines @@
 gfx::Rect DefaultHeaderPainter::GetLocalBounds() const {
   return gfx::Rect(view_->width(), height_);
 }
 
 gfx::Rect DefaultHeaderPainter::GetTitleBounds() const {
   return HeaderPainterUtil::GetTitleBounds(
       left_header_view_, caption_button_container_, GetTitleFontList());
 }
 
 SkColor DefaultHeaderPainter::GetInactiveFrameColor() const {
-  SkColor color = kFrameColor;
+  SkColor color = inactive_frame_color_;
   if (!frame_->IsMaximized() && !frame_->IsFullscreen()) {
     color = SkColorSetARGB(kInactiveFrameAlpha,
                            SkColorGetR(color),
                            SkColorGetG(color),
                            SkColorGetB(color));
   }
   return color;
 }
 
 }  // namespace ash