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 2749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2760 } | 2760 } |
2761 | 2761 |
2762 bool TabStrip::GetAdjustLayout() const { | 2762 bool TabStrip::GetAdjustLayout() const { |
2763 if (!adjust_layout_) | 2763 if (!adjust_layout_) |
2764 return false; | 2764 return false; |
2765 | 2765 |
2766 #if defined(USE_AURA) | 2766 #if defined(USE_AURA) |
2767 return chrome::GetHostDesktopTypeForNativeView( | 2767 return chrome::GetHostDesktopTypeForNativeView( |
2768 GetWidget()->GetNativeView()) == chrome::HOST_DESKTOP_TYPE_ASH; | 2768 GetWidget()->GetNativeView()) == chrome::HOST_DESKTOP_TYPE_ASH; |
2769 #else | 2769 #else |
2770 if (ui::GetDisplayLayout() != ui::LAYOUT_TOUCH) | 2770 return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH; |
2771 return false; | |
2772 #endif | 2771 #endif |
2773 | |
2774 return true; | |
2775 } | 2772 } |
OLD | NEW |