Enables stacked tabs for aura-metro

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 "chrome/browser/browser_process.h"
@@ skipping 32 matching lines @@
 
 TabRendererData::NetworkState TabContentsNetworkState(
     WebContents* contents) {
   if (!contents || !contents->IsLoading())
     return TabRendererData::NETWORK_STATE_NONE;
   if (contents->IsWaitingForResponse())
     return TabRendererData::NETWORK_STATE_WAITING;
   return TabRendererData::NETWORK_STATE_LOADING;
 }
 
-TabStripLayoutType DetermineTabStripLayout(PrefService* prefs,
-                                           bool* adjust_layout) {
+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(OS_CHROMEOS)
+#if defined(USE_AURA)
+  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;
   }
@@ skipping 276 matching lines @@
   model_->delegate()->AddBlankTabAt(-1, true);
 }
 
 bool BrowserTabStripController::IsIncognito() {
   return browser_->profile()->IsOffTheRecord();
 }
 
 void BrowserTabStripController::LayoutTypeMaybeChanged() {
   bool adjust_layout = false;
   TabStripLayoutType layout_type =
-      DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
+      DetermineTabStripLayout(g_browser_process->local_state(),
+                              browser_->host_desktop_type(), &adjust_layout);
   if (!adjust_layout || layout_type == tabstrip_->layout_type())
     return;
 
   g_browser_process->local_state()->SetInteger(
       prefs::kTabStripLayoutType,
       static_cast<int>(tabstrip_->layout_type()));
 }
 
 void BrowserTabStripController::OnStartedDraggingTabs() {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
@@ skipping 146 matching lines @@
   hover_tab_selector_.CancelTabTransition();
 
   TabRendererData data;
   SetTabRendererDataFromModel(contents, index, &data, NEW_TAB);
   tabstrip_->AddTabAt(index, data, is_active);
 }
 
 void BrowserTabStripController::UpdateLayoutType() {
   bool adjust_layout = false;
   TabStripLayoutType layout_type =
-      DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
+      DetermineTabStripLayout(g_browser_process->local_state(),
+                              browser_->host_desktop_type(), &adjust_layout);
   tabstrip_->SetLayoutType(layout_type, adjust_layout);
 }