Tab switcher theme colors no longer behind flag

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 "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_collections.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "chrome/browser/android/compositor/decoration_title.h"
 #include "chrome/browser/android/compositor/layer/content_layer.h"
 #include "chrome/browser/android/compositor/layer/toolbar_layer.h"
 #include "chrome/browser/android/compositor/layer_title_cache.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
-#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/android/compositor.h"
 #include "ui/android/resources/resource_manager.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/geometry/insets_f.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
@@ skipping 442 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);
 
-    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;
       front_border_->SetFilters(
-          *createSolidColorFilter(tab_switcher_color).get());
+          *createSolidColorFilter(toolbar_background_color).get());
     }
   }
 
   front_border_inner_shadow_->SetHideLayerAndSubtree(
       !border_inner_shadow_visible);
   if (border_inner_shadow_visible) {
     front_border_inner_shadow_->SetPosition(border_inner_shadow_position);
     front_border_inner_shadow_->SetBounds(border_inner_shadow_size);
     front_border_inner_shadow_->SetOpacity(border_inner_shadow_alpha);
   }
@@ skipping 150 matching lines @@
   return layer_;
 }
 
 TabLayer::TabLayer(bool incognito,
                    ui::ResourceManager* resource_manager,
                    LayerTitleCache* layer_title_cache,
                    TabContentManager* tab_content_manager)
     : incognito_(incognito),
       toolbar_background_color_(0),
       close_button_color_(0),
-      tab_switcher_themes_enabled_(false),
       resource_manager_(resource_manager),
       layer_title_cache_(layer_title_cache),
       layer_(cc::Layer::Create()),
       toolbar_layer_(ToolbarLayer::Create(resource_manager)),
       title_(cc::Layer::Create()),
       content_(ContentLayer::Create(tab_content_manager)),
       side_padding_(cc::SolidColorLayer::Create()),
       bottom_padding_(cc::SolidColorLayer::Create()),
       close_button_(cc::UIResourceLayer::Create()),
       front_border_(cc::NinePatchLayer::Create()),
@@ skipping 17 matching lines @@
   contour_shadow_->SetIsDrawable(true);
   side_padding_->SetIsDrawable(true);
   bottom_padding_->SetIsDrawable(true);
   front_border_->SetIsDrawable(true);
   front_border_inner_shadow_->SetIsDrawable(true);
   shadow_->SetIsDrawable(true);
   close_button_->SetIsDrawable(true);
   back_logo_->SetIsDrawable(true);
 
   front_border_->SetFillCenter(false);
-
-  tab_switcher_themes_enabled_ =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableTabSwitcherThemeColors);
 }
 
 TabLayer::~TabLayer() {
 }
 
 void TabLayer::SetTitle(DecorationTitle* title) {
   scoped_refptr<cc::Layer> layer = title ? title->layer() : nullptr;
 
   if (!layer.get()) {
     title_->RemoveAllChildren();
   } else {
     const cc::LayerList& children = title_->children();
     if (children.size() == 0 || children[0]->id() != layer->id()) {
       title_->RemoveAllChildren();
       title_->AddChild(layer);
     }
   }
 
   if (title)
     title->SetUIResourceIds();
 }
 
 }  //  namespace android
 }  //  namespace chrome