Remove ash default frame highlighting for custom colored frames.

ash/frame/default_header_painter.cc

Index: ash/frame/default_header_painter.cc
diff --git a/ash/frame/default_header_painter.cc b/ash/frame/default_header_painter.cc
index 125cb510e2c161da0730ab929f8529cdaea95fad..530a6d703fc0ce08298b2562abf57b2af155dc80 100644
--- a/ash/frame/default_header_painter.cc
+++ b/ash/frame/default_header_painter.cc
@@ -170,16 +170,16 @@ void DefaultHeaderPainter::PaintHeader(gfx::Canvas* canvas, Mode mode) {
 
   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() {
@@ -340,6 +340,11 @@ gfx::Rect DefaultHeaderPainter::GetTitleBounds() const {
       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()) {