| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 5 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windowsx.h> | 8 #include <windowsx.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 2735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2746 if (reset_to_shrink_on_exit_) | 2746 if (reset_to_shrink_on_exit_) |
| 2747 AddMessageLoopObserver(); | 2747 AddMessageLoopObserver(); |
| 2748 else | 2748 else |
| 2749 RemoveMessageLoopObserver(); | 2749 RemoveMessageLoopObserver(); |
| 2750 } | 2750 } |
| 2751 | 2751 |
| 2752 bool TabStrip::GetAdjustLayout() const { | 2752 bool TabStrip::GetAdjustLayout() const { |
| 2753 if (!adjust_layout_) | 2753 if (!adjust_layout_) |
| 2754 return false; | 2754 return false; |
| 2755 | 2755 |
| 2756 #if defined(USE_AURA) | |
| 2757 return chrome::GetHostDesktopTypeForNativeView( | 2756 return chrome::GetHostDesktopTypeForNativeView( |
| 2758 GetWidget()->GetNativeView()) == chrome::HOST_DESKTOP_TYPE_ASH; | 2757 GetWidget()->GetNativeView()) == chrome::HOST_DESKTOP_TYPE_ASH; |
| 2759 #else | |
| 2760 return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH; | |
| 2761 #endif | |
| 2762 } | 2758 } |
| OLD | NEW |