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 224 matching lines @@
 void DefaultHeaderPainter::AnimationProgressed(
     const gfx::Animation* animation) {
   view_->SchedulePaintInRect(GetLocalBounds());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, private:
 
 void DefaultHeaderPainter::PaintHighlightForInactiveRestoredWindow(
     gfx::Canvas* canvas) {
+  if (HasCustomFrameColors())

[pkotwicz, 2015/02/12 02:04:52]

I think it would make more sense to add this logic to the caller. There are
already a bunch of conditions which control whether this method gets called.
Yes, this function name will no longer be accurate but I think that's ok

[benwells, 2015/02/12 02:36:10]

Done.

+    return;
+
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::ImageSkia top_edge = *rb.GetImageSkiaNamed(
       IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_TOP);
   gfx::ImageSkia left_edge = *rb.GetImageSkiaNamed(
       IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_LEFT);
   gfx::ImageSkia right_edge = *rb.GetImageSkiaNamed(
       IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_RIGHT);
   gfx::ImageSkia bottom_edge = *rb.GetImageSkiaNamed(
       IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_BOTTOM);
 
@@ skipping 24 matching lines @@
   gfx::Rect title_bounds = GetTitleBounds();
   title_bounds.set_x(view_->GetMirroredXForRect(title_bounds));
   canvas->DrawStringRectWithFlags(frame_->widget_delegate()->GetWindowTitle(),
                                   GetTitleFontList(),
                                   kTitleTextColor,
                                   title_bounds,
                                   gfx::Canvas::NO_SUBPIXEL_RENDERING);
 }
 
 void DefaultHeaderPainter::PaintHeaderContentSeparator(gfx::Canvas* canvas) {
+  if (HasCustomFrameColors())
+    return;
+
   SkColor color = (mode_ == MODE_ACTIVE) ?
       kHeaderContentSeparatorColor :
       kHeaderContentSeparatorInactiveColor;
 
   SkPaint paint;
   paint.setColor(color);
   // Draw the line as 1px thick regardless of scale factor.
   paint.setStrokeWidth(0);
 
   float thickness = 1 / canvas->image_scale();
@@ skipping 34 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::HasCustomFrameColors() 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