Removes --enable-stacked-tab-strip flag (Stacked Tabs)

chrome/browser/ui/views/tabs/browser_tab_strip_controller.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/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/task_runner_util.h"
@@ skipping 46 matching lines @@
   if (contents->IsWaitingForResponse())
     return TabRendererData::NETWORK_STATE_WAITING;
   return TabRendererData::NETWORK_STATE_LOADING;
 }
 
 TabStripLayoutType DetermineTabStripLayout(
     PrefService* prefs,
     chrome::HostDesktopType host_desktop_type,
     bool* adjust_layout) {
   *adjust_layout = false;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableStackedTabStrip)) {
-    return TAB_STRIP_LAYOUT_STACKED;
-  }
   // For ash, always allow entering stacked mode.
   if (host_desktop_type != chrome::HOST_DESKTOP_TYPE_ASH)
     return TAB_STRIP_LAYOUT_SHRINK;
   *adjust_layout = true;
   switch (prefs->GetInteger(prefs::kTabStripLayoutType)) {
     case TAB_STRIP_LAYOUT_STACKED:
       return TAB_STRIP_LAYOUT_STACKED;
     default:
       return TAB_STRIP_LAYOUT_SHRINK;

[Peter Kasting, 2014/05/20 20:48:15]

While you're touching this code, it looks like there are some other changes that
could be made.

(1) The comment at the top seems confusing, as the code is really about non-Ash,
not Ash.
(2) I don't see why the |adjust_layout| parameter is necessary.
(3) The end of the function could be written more simply as

  return (prefs->GetInteger(prefs::kTabStripLayoutType) ==
      TAB_STRIP_LAYOUT_STACKED) ?
      TAB_STRIP_LAYOUT_STACKED : TAB_STRIP_LAYOUT_SHRINK;

But frankly, this suggests that instead of using an integral pref and enumerated
states everywhere, we should do something like switch everything to a bool named
"stacked_tabs" or something.  And I don't see why this can't all be handled in
the tabstrip, instead of having to affect the BrowserTabStripController.

sky wrote all this stuff, so you should really send this feedback to him, not
me.

[varkha, 2014/05/21 15:03:25]

+sky@, should I maybe refactor this to boolean state in this CL?

[sky, 2014/05/21 16:30:08]

Agreed.
There are really three states:
1 shrink
2 shrink and can switch to stacked
3 stacked

adjust_layout distinguishes 1 and 3.
I've tried to minimize the dependencies of the tabstrip on chrome.
TabStripController handles those.
Yes, a boolean value is fine.

   }
 }
 
 // Get the MIME type of the file pointed to by the url, based on the file's
 // extension. Must be called on a thread that allows IO.
 std::string FindURLMimeType(const GURL& url) {
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   base::FilePath full_path;
   net::FileURLToFilePath(url, &full_path);
 
@@ skipping 498 matching lines @@
       url,
       mime_type.empty() ||
       net::IsSupportedMimeType(mime_type) ||
       content::PluginService::GetInstance()->GetPluginInfo(
           -1,                // process ID
           MSG_ROUTING_NONE,  // routing ID
           model_->profile()->GetResourceContext(),
           url, GURL(), mime_type, false,
           NULL, &plugin, NULL));
 }