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 dc34399b5836eee01c9429bddcf224846b25ceae..f2f084a63618706cb2f9ac32ebd377ed4b931f00 100644 |
--- a/chrome/browser/ui/views/tabs/tab_strip.cc |
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc |
@@ -1414,7 +1414,7 @@ ui::GestureStatus TabStrip::OnGestureEvent( |
switch (event.type()) { |
case ui::ET_GESTURE_END: |
EndDrag(false); |
- if (adjust_layout_ && ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
+ if (adjust_layout_) { |
SetLayoutType(TAB_STRIP_LAYOUT_STACKED, true); |
controller_->LayoutTypeMaybeChanged(); |
} |
@@ -1799,9 +1799,14 @@ void TabStrip::PaintClosingTabs(gfx::Canvas* canvas, int index) { |
void TabStrip::UpdateLayoutTypeFromMouseEvent(views::View* source, |
const ui::MouseEvent& event) { |
- if (!adjust_layout_ || ui::GetDisplayLayout() != ui::LAYOUT_TOUCH) |
+ if (!adjust_layout_) |
return; |
+#if !defined(OS_CHROMEOS) |
+ if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH) |
+ return; |
+#endif |
+ |
// The following code attempts to switch to TAB_STRIP_LAYOUT_SHRINK when the |
// mouse is used, and TAB_STRIP_LAYOUT_STACKED when a touch device is |
// used. This is made problematic by windows generating mouse move events that |