chrome/browser/ui/views/tabs/tab_strip.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/tab_strip.cc

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

Patch Set: Rebase to ToT and throw away conflicting files; I'll redo them in another patch. 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/tab_strip.cc

diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc

index 0904445148216babf4e93a3354eeba10c21c9f8c..b403ef24ed2a86470cd591678e43dfcbd6bbe317 100644

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

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

@@ -2753,10 +2753,6 @@ bool TabStrip::GetAdjustLayout() const {

if (!adjust_layout_)

return false;

-#if defined(USE_AURA)

return chrome::GetHostDesktopTypeForNativeView(

GetWidget()->GetNativeView()) == chrome::HOST_DESKTOP_TYPE_ASH;

-#else

- return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH;

-#endif

}