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

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

Issue 247193002: Remove touch layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 04bceeba2d81443d58e03a4f24e0e783242a3d20..25d3c0b51a65bac006518f408a69effb51724603 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -70,14 +70,9 @@ TabStripLayoutType DetermineTabStripLayout(
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:

Powered by Google App Engine
This is Rietveld 408576698