Hide close buttons of inactive stacked tabs by default

chrome/browser/ui/views/tabs/tab_strip.cc

 // Copyright (c) 2012 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/ui/views/tabs/tab_strip.h"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 951 matching lines @@
 
 const ui::ListSelectionModel& TabStrip::GetSelectionModel() {
   return controller_->GetSelectionModel();
 }
 
 bool TabStrip::SupportsMultipleSelection() {
   // TODO: currently only allow single selection in touch layout mode.
   return touch_layout_ == NULL;
 }
 
-// TODO(tdanderson): Modify this logic and clean up related code once a
-//                   decision has been made on the experimental
-//                   flag --tab-close-buttons-hidden-with-touch.
 bool TabStrip::ShouldHideCloseButtonForInactiveTab(const Tab* tab) {
   DCHECK(!tab->IsActive());
 
   // Do not force the close button to hide if mouse was used as
-  // the last input type to interact with the tab strip.
-  if (!stacked_layout_)
+  // the last input type to interact with the tab strip or if
+  // the tabs are wider than the width used for stacked tabs.
+  if (!stacked_layout_ || tab->width() > Tab::GetTouchWidth())

[sky, 2015/03/06 23:28:33]

Don't you just care about if touch_layout_ is non-null here?

[tdanderson, 2015/03/09 17:30:53]

Yes, you're right - I can just do that instead since I'm removing the other
variants. Changed.

     return false;
 
-  std::string switch_value =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kTabCloseButtonsHiddenWithTouch);
-  int width = tab->width();
-  if (switch_value == "always" ||
-      (switch_value == "narrow" && width < Tab::GetStandardSize().width()) ||
-      (switch_value == "stacked" && width <= Tab::GetTouchWidth())) {
-    return true;
-  }
-
-  return false;
+  return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableHideInactiveStackedTabCloseButtons);
 }
 
 void TabStrip::SelectTab(Tab* tab) {
   int model_index = GetModelIndexOfTab(tab);
   if (IsValidModelIndex(model_index))
     controller_->SelectTab(model_index);
 }
 
 void TabStrip::ExtendSelectionTo(Tab* tab) {
   int model_index = GetModelIndexOfTab(tab);
@@ skipping 1762 matching lines @@
           ConvertPointToViewAndGetEventHandler(this, newtab_button_, point);
       if (view)
         return view;
     }
     Tab* tab = FindTabForEvent(point);
     if (tab)
       return ConvertPointToViewAndGetEventHandler(this, tab, point);
   }
   return this;
 }