Index: chrome/browser/ui/views/tabs/tab_strip.cc |
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc |
index f3bdb8347c75b0ee395432ddbc5df6394533590c..8a63d2bf7cb711bac84d85a4fb450ba93f695c90 100644 |
--- a/chrome/browser/ui/views/tabs/tab_strip.cc |
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc |
@@ -18,6 +18,7 @@ |
#include "base/stl_util.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/defaults.h" |
+#include "chrome/browser/ui/host_desktop.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
#include "chrome/browser/ui/view_ids.h" |
#include "chrome/browser/ui/views/tabs/stacked_tab_strip_layout.h" |
@@ -2727,7 +2728,10 @@ bool TabStrip::GetAdjustLayout() const { |
if (!adjust_layout_) |
return false; |
-#if !defined(OS_CHROMEOS) |
+#if defined(USE_AURA) |
+ return chrome::GetHostDesktopTypeForNativeView( |
+ GetWidget()->GetNativeView()) == chrome::HOST_DESKTOP_TYPE_ASH; |
+#else |
if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH) |
return false; |
#endif |