Replace tab switcher borders with single asset

chrome/browser/android/compositor/layer/tab_layer.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 "chrome/browser/android/compositor/layer/tab_layer.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "cc/layers/layer.h"
@@ skipping 116 matching lines @@
                              float border_scale,
                              float saturation,
                              float brightness,
                              float close_btn_width,
                              float static_to_view_blend,
                              float content_width,
                              float content_height,
                              float view_width,
                              float view_height,
                              bool show_toolbar,
+                             int default_theme_color,
                              int toolbar_background_color,
                              bool anonymize_toolbar,
                              int toolbar_textbox_resource_id,
                              int toolbar_textbox_background_color,
                              float toolbar_textbox_alpha,
                              float toolbar_alpha,
                              float toolbar_y_offset,
                              float side_border_scale,
                              bool attach_content,
                              bool inset_border) {
@@ skipping 325 matching lines @@
     contour_shadow_->SetOpacity(contour_alpha);
   }
 
   front_border_->SetHideLayerAndSubtree(!border_visible);
   if (border_visible) {
     front_border_->SetPosition(border_position);
     front_border_->SetBounds(border_size);
     front_border_->SetOpacity(border_alpha);
     front_border_->SetNearestNeighbor(toolbar_visible);
 
-    // Colorize the tab decoration.
-    if (tab_switcher_themes_enabled_ && !incognito_
-        && toolbar_background_color != toolbar_background_color_) {
+    int tab_switcher_color = default_theme_color;
+
+    // Colorize the tab decoration if enabled.
+    if (tab_switcher_themes_enabled_) {
+        tab_switcher_color = toolbar_background_color;
+    }
+
+    if (toolbar_background_color != toolbar_background_color_) {
       toolbar_background_color_ = toolbar_background_color;
       cc::FilterOperations filters;
       SkScalar colorMatrix[] = {
-          SkColorGetR(toolbar_background_color) / 255.0f, 0, 0, 0, 0,
-          0, SkColorGetG(toolbar_background_color) / 255.0f, 0, 0, 0,
-          0, 0, SkColorGetB(toolbar_background_color) / 255.0f, 0, 0,
+          SkColorGetR(tab_switcher_color) / 255.0f, 0, 0, 0, 0,
+          0, SkColorGetG(tab_switcher_color) / 255.0f, 0, 0, 0,
+          0, 0, SkColorGetB(tab_switcher_color) / 255.0f, 0, 0,
           0, 0, 0, 1, 0,
       };
       filters.Append(cc::FilterOperation::CreateColorMatrixFilter(colorMatrix));
       front_border_->SetFilters(filters);
     }
   }
 
   front_border_inner_shadow_->SetHideLayerAndSubtree(
       !border_inner_shadow_visible);
   if (border_inner_shadow_visible) {
@@ skipping 198 matching lines @@
       title_->AddChild(layer);
     }
   }
 
   if (title)
     title->SetUIResourceIds();
 }
 
 }  //  namespace android
 }  //  namespace chrome