chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc - Issue 246633004: Remove non USE_AURA code from views files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 246633004: Remove non USE_AURA code from views files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Just revert changes to ui/app_list/. 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:

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..f5e3852a6264bf93733a5ec8c0e21d334c4b9f4c 100644

--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

@@ -71,13 +71,8 @@ TabStripLayoutType DetermineTabStripLayout(

return TAB_STRIP_LAYOUT_STACKED;

}

// For chromeos always allow entering stacked mode.

-#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: