Remove touch layout

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 52 matching lines @@
 
 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 chromeos always allow entering stacked mode.
-#if defined(USE_AURA)
+  // For ash, always allow entering stacked mode.
   if (host_desktop_type != chrome::HOST_DESKTOP_TYPE_ASH)
     return TAB_STRIP_LAYOUT_SHRINK;
-#else
-  if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH)
-    return TAB_STRIP_LAYOUT_SHRINK;
-#endif
   *adjust_layout = true;
   switch (prefs->GetInteger(prefs::kTabStripLayoutType)) {
     case TAB_STRIP_LAYOUT_STACKED:
       return TAB_STRIP_LAYOUT_STACKED;
     default:
       return TAB_STRIP_LAYOUT_SHRINK;
   }
 }
 
 // Get the MIME type of the file pointed to by the url, based on the file's
@@ skipping 501 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));
 }