OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/gfx/size.h" | 7 #include "base/gfx/size.h" |
8 #include "chrome/app/theme/theme_resources.h" | 8 #include "chrome/app/theme/theme_resources.h" |
9 #include "chrome/browser/profile.h" | 9 #include "chrome/browser/profile.h" |
10 #include "chrome/browser/tab_contents.h" | 10 #include "chrome/browser/tab_contents.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "chrome/common/stl_util-inl.h" | 25 #include "chrome/common/stl_util-inl.h" |
26 #include "chrome/common/win_util.h" | 26 #include "chrome/common/win_util.h" |
27 #include "chrome/views/image_view.h" | 27 #include "chrome/views/image_view.h" |
28 #include "chrome/views/painter.h" | 28 #include "chrome/views/painter.h" |
29 | 29 |
30 #include "generated_resources.h" | 30 #include "generated_resources.h" |
31 | 31 |
32 #undef min | 32 #undef min |
33 #undef max | 33 #undef max |
34 | 34 |
| 35 using base::TimeDelta; |
35 using views::DropTargetEvent; | 36 using views::DropTargetEvent; |
36 | 37 |
37 static const int kDefaultAnimationDurationMs = 100; | 38 static const int kDefaultAnimationDurationMs = 100; |
38 static const int kResizeLayoutAnimationDurationMs = 166; | 39 static const int kResizeLayoutAnimationDurationMs = 166; |
39 static const int kReorderAnimationDurationMs = 166; | 40 static const int kReorderAnimationDurationMs = 166; |
40 | 41 |
41 static const int kLoadingAnimationFrameTimeMs = 30; | 42 static const int kLoadingAnimationFrameTimeMs = 30; |
42 static const int kNewTabButtonHOffset = -5; | 43 static const int kNewTabButtonHOffset = -5; |
43 static const int kNewTabButtonVOffset = 5; | 44 static const int kNewTabButtonVOffset = 5; |
44 static const int kResizeTabsTimeMs = 300; | 45 static const int kResizeTabsTimeMs = 300; |
(...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1557 return last_tab->x() + last_tab->width(); | 1558 return last_tab->x() + last_tab->width(); |
1558 } | 1559 } |
1559 | 1560 |
1560 bool TabStrip::IsPointInTab(Tab* tab, | 1561 bool TabStrip::IsPointInTab(Tab* tab, |
1561 const gfx::Point& point_in_tabstrip_coords) { | 1562 const gfx::Point& point_in_tabstrip_coords) { |
1562 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); | 1563 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); |
1563 View::ConvertPointToView(this, tab, &point_in_tab_coords); | 1564 View::ConvertPointToView(this, tab, &point_in_tab_coords); |
1564 return tab->HitTest(point_in_tab_coords); | 1565 return tab->HitTest(point_in_tab_coords); |
1565 } | 1566 } |
1566 | 1567 |
OLD | NEW |