Experiment to hide close buttons of inactive tabs when using touch

chrome/browser/ui/tabs/tab_utils.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/tabs/tab_utils.h"
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/views/tabs/tab.h"

[tdanderson, 2015/02/06 20:34:33]

I added this so that I can access the static methods in Tab which give the
ideal/touch widths, but this is a violation of the include rules. Can you
suggest the best way to make the width information available?

[tdanderson, 2015/02/10 18:52:17]

No longer an issue since I've moved the new logic into Tab.

 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/multi_animation.h"
 
 namespace chrome {
 
@@ skipping 51 matching lines @@
       base::TimeDelta::FromMilliseconds(kIndicatorFrameIntervalMs);
   scoped_ptr<TabRecordingIndicatorAnimation> animation(
       new TabRecordingIndicatorAnimation(parts, interval));
   animation->set_continuous(false);
   return animation.Pass();
 }
 
 }  // namespace
 
 bool ShouldTabShowFavicon(int capacity,
+                          int width,
+                          bool touch_used_last,
                           bool is_pinned_tab,
                           bool is_active_tab,
                           bool has_favicon,
                           TabMediaState media_state) {
   if (!has_favicon)
     return false;
   int required_capacity = 1;
-  if (ShouldTabShowCloseButton(capacity, is_pinned_tab, is_active_tab))
+  if (ShouldTabShowCloseButton(capacity,
+                               width,
+                               touch_used_last,
+                               is_pinned_tab,
+                               is_active_tab)) {
     ++required_capacity;
-  if (ShouldTabShowMediaIndicator(
-          capacity, is_pinned_tab, is_active_tab, has_favicon, media_state)) {
+  }
+  if (ShouldTabShowMediaIndicator(capacity,
+                                  width,
+                                  touch_used_last,
+                                  is_pinned_tab,
+                                  is_active_tab,
+                                  has_favicon,
+                                  media_state)) {
     ++required_capacity;
   }
   return capacity >= required_capacity;
 }
 
 bool ShouldTabShowMediaIndicator(int capacity,
+                                 int width,
+                                 bool touch_used_last,
                                  bool is_pinned_tab,
                                  bool is_active_tab,
                                  bool has_favicon,
                                  TabMediaState media_state) {
   if (media_state == TAB_MEDIA_STATE_NONE)
     return false;
-  if (ShouldTabShowCloseButton(capacity, is_pinned_tab, is_active_tab))
+  if (ShouldTabShowCloseButton(capacity,
+                               width,
+                               touch_used_last,
+                               is_pinned_tab,
+                               is_active_tab)) {
     return capacity >= 2;
+  }
   return capacity >= 1;
 }
 
 bool ShouldTabShowCloseButton(int capacity,
+                              int width,
+                              bool touch_used_last,
                               bool is_pinned_tab,
                               bool is_active_tab) {
   if (is_pinned_tab)
     return false;
   else if (is_active_tab)
     return true;
-  else
-    return capacity >= 3;
+
+  if (touch_used_last) {
+    std::string switch_value =
+        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+            switches::kTabCloseButtonsHiddenWithTouch);
+    if (switch_value == "always")

[sky, 2015/02/07 00:09:39]

This code is basically saying if touch_used_last (and one of these flags is set)
don't show the close button. That conditional can just as well be moved to views
and don't call this function. Which basically means no changes are necessary
here.

[tdanderson, 2015/02/10 18:52:17]

Done.

+      return false;
+    else if (switch_value == "narrow" && width < Tab::GetStandardSize().width())
+      return false;
+    else if (switch_value == "stacked" && width <= Tab::GetTouchWidth())
+      return false;
+  }
+
+  return capacity >= 3;
 }
 
 bool IsPlayingAudio(content::WebContents* contents) {
   return contents->WasRecentlyAudible();
 }
 
 TabMediaState GetTabMediaStateForContents(content::WebContents* contents) {
   if (!contents)
     return TAB_MEDIA_STATE_NONE;
 
@@ skipping 136 matching lines @@
                      const std::vector<int>& indices) {
   for (std::vector<int>::const_iterator i = indices.begin(); i != indices.end();
        ++i) {
     if (!IsTabAudioMuted(tab_strip.GetWebContentsAt(*i)))
       return false;
   }
   return true;
 }
 
 }  // namespace chrome