OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/views/tabs/tab_strip.h" | 5 #include "chrome/browser/views/tabs/tab_strip.h" |
6 | 6 |
7 #include "app/drag_drop_types.h" | 7 #include "app/drag_drop_types.h" |
8 #include "app/gfx/canvas.h" | 8 #include "app/gfx/canvas.h" |
9 #include "app/gfx/path.h" | 9 #include "app/gfx/path.h" |
10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
30 #include "views/controls/image_view.h" | 30 #include "views/controls/image_view.h" |
31 #include "views/painter.h" | 31 #include "views/painter.h" |
32 #include "views/widget/default_theme_provider.h" | 32 #include "views/widget/default_theme_provider.h" |
33 #include "views/window/non_client_view.h" | 33 #include "views/window/non_client_view.h" |
34 #include "views/window/window.h" | 34 #include "views/window/window.h" |
35 | 35 |
36 #undef min | 36 #undef min |
37 #undef max | 37 #undef max |
38 | 38 |
| 39 #if defined(COMPILER_GCC) |
| 40 // Squash false positive signed overflow warning in GenerateStartAndEndWidths |
| 41 // when doing 'start_tab_count < end_tab_count'. |
| 42 #pragma GCC diagnostic ignored "-Wstrict-overflow" |
| 43 #endif |
| 44 |
39 using views::DropTargetEvent; | 45 using views::DropTargetEvent; |
40 | 46 |
41 static const int kDefaultAnimationDurationMs = 100; | 47 static const int kDefaultAnimationDurationMs = 100; |
42 static const int kResizeLayoutAnimationDurationMs = 166; | 48 static const int kResizeLayoutAnimationDurationMs = 166; |
43 static const int kReorderAnimationDurationMs = 166; | 49 static const int kReorderAnimationDurationMs = 166; |
44 | 50 |
45 static const int kNewTabButtonHOffset = -5; | 51 static const int kNewTabButtonHOffset = -5; |
46 static const int kNewTabButtonVOffset = 5; | 52 static const int kNewTabButtonVOffset = 5; |
47 static const int kResizeTabsTimeMs = 300; | 53 static const int kResizeTabsTimeMs = 300; |
48 static const int kSuspendAnimationsTimeMs = 200; | 54 static const int kSuspendAnimationsTimeMs = 200; |
(...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1632 &TabStrip::ResizeLayoutTabs), | 1638 &TabStrip::ResizeLayoutTabs), |
1633 kResizeTabsTimeMs); | 1639 kResizeTabsTimeMs); |
1634 } | 1640 } |
1635 } else { | 1641 } else { |
1636 // Mouse moved quickly out of the tab strip and then into it again, so | 1642 // Mouse moved quickly out of the tab strip and then into it again, so |
1637 // cancel the timer so that the strip doesn't move when the mouse moves | 1643 // cancel the timer so that the strip doesn't move when the mouse moves |
1638 // back over it. | 1644 // back over it. |
1639 resize_layout_factory_.RevokeAll(); | 1645 resize_layout_factory_.RevokeAll(); |
1640 } | 1646 } |
1641 } | 1647 } |
OLD | NEW |