OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "grit/theme_resources.h" | 21 #include "grit/theme_resources.h" |
22 #include "grit/theme_resources_standard.h" | 22 #include "grit/theme_resources_standard.h" |
23 #include "ui/base/accessibility/accessible_view_state.h" | 23 #include "ui/base/accessibility/accessible_view_state.h" |
24 #include "ui/base/animation/animation_container.h" | 24 #include "ui/base/animation/animation_container.h" |
25 #include "ui/base/dragdrop/drag_drop_types.h" | 25 #include "ui/base/dragdrop/drag_drop_types.h" |
26 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
27 #include "ui/base/resource/resource_bundle.h" | 27 #include "ui/base/resource/resource_bundle.h" |
28 #include "ui/gfx/canvas_skia.h" | 28 #include "ui/gfx/canvas_skia.h" |
29 #include "ui/gfx/path.h" | 29 #include "ui/gfx/path.h" |
30 #include "ui/gfx/size.h" | 30 #include "ui/gfx/size.h" |
| 31 #include "ui/views/window/non_client_view.h" |
31 #include "views/controls/image_view.h" | 32 #include "views/controls/image_view.h" |
32 #include "views/widget/default_theme_provider.h" | 33 #include "views/widget/default_theme_provider.h" |
33 #include "views/widget/widget.h" | 34 #include "views/widget/widget.h" |
34 #include "views/window/non_client_view.h" | |
35 | 35 |
36 #if defined(OS_WIN) | 36 #if defined(OS_WIN) |
37 #include "ui/base/win/hwnd_util.h" | 37 #include "ui/base/win/hwnd_util.h" |
38 #include "views/widget/monitor_win.h" | 38 #include "views/widget/monitor_win.h" |
39 #endif | 39 #endif |
40 | 40 |
41 using views::DropTargetEvent; | 41 using views::DropTargetEvent; |
42 | 42 |
43 static const int kNewTabButtonHOffset = -5; | 43 static const int kNewTabButtonHOffset = -5; |
44 static const int kNewTabButtonVOffset = 5; | 44 static const int kNewTabButtonVOffset = 5; |
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1059 } | 1059 } |
1060 return mini_count; | 1060 return mini_count; |
1061 } | 1061 } |
1062 | 1062 |
1063 bool TabStrip::IsPointInTab(Tab* tab, | 1063 bool TabStrip::IsPointInTab(Tab* tab, |
1064 const gfx::Point& point_in_tabstrip_coords) { | 1064 const gfx::Point& point_in_tabstrip_coords) { |
1065 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); | 1065 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); |
1066 View::ConvertPointToView(this, tab, &point_in_tab_coords); | 1066 View::ConvertPointToView(this, tab, &point_in_tab_coords); |
1067 return tab->HitTest(point_in_tab_coords); | 1067 return tab->HitTest(point_in_tab_coords); |
1068 } | 1068 } |
OLD | NEW |