Remove ash default frame highlighting for custom colored frames.

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 152 matching lines @@
   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(
       active_frame_color_, GetInactiveFrameColor(), active_alpha));
 
   TileRoundRect(canvas, paint, GetLocalBounds(), corner_radius);
 
-  if (!frame_->IsMaximized() &&
-      !frame_->IsFullscreen() &&
-      mode_ == MODE_INACTIVE) {
+  if (!frame_->IsMaximized() && !frame_->IsFullscreen() &&
+      mode_ == MODE_INACTIVE && !UsesCustomFrameColors()) {
     PaintHighlightForInactiveRestoredWindow(canvas);
   }
   if (frame_->widget_delegate() &&
       frame_->widget_delegate()->ShouldShowWindowTitle()) {
     PaintTitleBar(canvas);
   }
-  PaintHeaderContentSeparator(canvas);
+  if (!UsesCustomFrameColors())
+    PaintHeaderContentSeparator(canvas);
 }
 
 void DefaultHeaderPainter::LayoutHeader() {
   UpdateSizeButtonImages();
   caption_button_container_->Layout();
 
   gfx::Size caption_button_container_size =
       caption_button_container_->GetPreferredSize();
   caption_button_container_->SetBounds(
       view_->width() - caption_button_container_size.width(),
@@ skipping 140 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());
 }
 
+bool DefaultHeaderPainter::UsesCustomFrameColors() const {
+  return active_frame_color_ != kDefaultFrameColor ||
+         inactive_frame_color_ != kDefaultFrameColor;
+}
+
 SkColor DefaultHeaderPainter::GetInactiveFrameColor() const {
   SkColor color = inactive_frame_color_;
   if (!frame_->IsMaximized() && !frame_->IsFullscreen()) {
     color = SkColorSetARGB(kInactiveFrameAlpha,
                            SkColorGetR(color),
                            SkColorGetG(color),
                            SkColorGetB(color));
   }
   return color;
 }
 
 }  // namespace ash