Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2410)

Unified Diff: chrome/browser/ui/views/tabs/tab_strip.cc

Issue 10830325: Makes the TabStrip always have the ability to enter stacking mode on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698