OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/animation_container.h" | |
8 #include "app/drag_drop_types.h" | 7 #include "app/drag_drop_types.h" |
9 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
11 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
12 #include "base/stl_util-inl.h" | 11 #include "base/stl_util-inl.h" |
13 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
14 #include "chrome/browser/defaults.h" | 13 #include "chrome/browser/defaults.h" |
15 #include "chrome/browser/themes/browser_theme_provider.h" | 14 #include "chrome/browser/themes/browser_theme_provider.h" |
16 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/view_ids.h" | 16 #include "chrome/browser/ui/view_ids.h" |
18 #include "chrome/browser/ui/views/tabs/tab.h" | 17 #include "chrome/browser/ui/views/tabs/tab.h" |
19 #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" | 18 #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" |
20 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
21 #include "gfx/canvas_skia.h" | 20 #include "gfx/canvas_skia.h" |
22 #include "gfx/path.h" | 21 #include "gfx/path.h" |
23 #include "gfx/size.h" | 22 #include "gfx/size.h" |
24 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
25 #include "grit/theme_resources.h" | 24 #include "grit/theme_resources.h" |
| 25 #include "ui/base/animation/animation_container.h" |
26 #include "views/controls/image_view.h" | 26 #include "views/controls/image_view.h" |
27 #include "views/widget/default_theme_provider.h" | 27 #include "views/widget/default_theme_provider.h" |
28 #include "views/window/non_client_view.h" | 28 #include "views/window/non_client_view.h" |
29 #include "views/window/window.h" | 29 #include "views/window/window.h" |
30 | 30 |
31 #if defined(OS_WIN) | 31 #if defined(OS_WIN) |
32 #include "app/win/win_util.h" | 32 #include "app/win/win_util.h" |
33 #include "views/widget/widget_win.h" | 33 #include "views/widget/widget_win.h" |
34 #elif defined(OS_LINUX) | 34 #elif defined(OS_LINUX) |
35 #include "views/widget/widget_gtk.h" | 35 #include "views/widget/widget_gtk.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 | 113 |
114 // static | 114 // static |
115 const int TabStrip::mini_to_non_mini_gap_ = 3; | 115 const int TabStrip::mini_to_non_mini_gap_ = 3; |
116 | 116 |
117 TabStrip::TabStrip(TabStripController* controller) | 117 TabStrip::TabStrip(TabStripController* controller) |
118 : BaseTabStrip(controller, BaseTabStrip::HORIZONTAL_TAB_STRIP), | 118 : BaseTabStrip(controller, BaseTabStrip::HORIZONTAL_TAB_STRIP), |
119 current_unselected_width_(Tab::GetStandardSize().width()), | 119 current_unselected_width_(Tab::GetStandardSize().width()), |
120 current_selected_width_(Tab::GetStandardSize().width()), | 120 current_selected_width_(Tab::GetStandardSize().width()), |
121 available_width_for_tabs_(-1), | 121 available_width_for_tabs_(-1), |
122 in_tab_close_(false), | 122 in_tab_close_(false), |
123 animation_container_(new AnimationContainer()) { | 123 animation_container_(new ui::AnimationContainer()) { |
124 Init(); | 124 Init(); |
125 } | 125 } |
126 | 126 |
127 TabStrip::~TabStrip() { | 127 TabStrip::~TabStrip() { |
128 // The animations may reference the tabs. Shut down the animation before we | 128 // The animations may reference the tabs. Shut down the animation before we |
129 // delete the tabs. | 129 // delete the tabs. |
130 StopAnimating(false); | 130 StopAnimating(false); |
131 | 131 |
132 DestroyDragController(); | 132 DestroyDragController(); |
133 | 133 |
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
968 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const { | 968 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const { |
969 return last_tab->x() + last_tab->width(); | 969 return last_tab->x() + last_tab->width(); |
970 } | 970 } |
971 | 971 |
972 bool TabStrip::IsPointInTab(Tab* tab, | 972 bool TabStrip::IsPointInTab(Tab* tab, |
973 const gfx::Point& point_in_tabstrip_coords) { | 973 const gfx::Point& point_in_tabstrip_coords) { |
974 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); | 974 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); |
975 View::ConvertPointToView(this, tab, &point_in_tab_coords); | 975 View::ConvertPointToView(this, tab, &point_in_tab_coords); |
976 return tab->HitTest(point_in_tab_coords); | 976 return tab->HitTest(point_in_tab_coords); |
977 } | 977 } |
OLD | NEW |