| 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 | 8 |
| 9 #include "app/drag_drop_types.h" | 9 #include "app/drag_drop_types.h" |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 } | 143 } |
| 144 | 144 |
| 145 void TabStrip::InitTabStripButtons() { | 145 void TabStrip::InitTabStripButtons() { |
| 146 newtab_button_ = new NewTabButton(this); | 146 newtab_button_ = new NewTabButton(this); |
| 147 if (browser_defaults::kSizeTabButtonToTopOfTabStrip) { | 147 if (browser_defaults::kSizeTabButtonToTopOfTabStrip) { |
| 148 newtab_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT, | 148 newtab_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT, |
| 149 views::ImageButton::ALIGN_BOTTOM); | 149 views::ImageButton::ALIGN_BOTTOM); |
| 150 } | 150 } |
| 151 LoadNewTabButtonImage(); | 151 LoadNewTabButtonImage(); |
| 152 newtab_button_->SetAccessibleName( | 152 newtab_button_->SetAccessibleName( |
| 153 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB))); | 153 l10n_util::GetStringUTF16(IDS_ACCNAME_NEWTAB)); |
| 154 AddChildView(newtab_button_); | 154 AddChildView(newtab_button_); |
| 155 } | 155 } |
| 156 | 156 |
| 157 gfx::Rect TabStrip::GetNewTabButtonBounds() { | 157 gfx::Rect TabStrip::GetNewTabButtonBounds() { |
| 158 return newtab_button_->bounds(); | 158 return newtab_button_->bounds(); |
| 159 } | 159 } |
| 160 | 160 |
| 161 void TabStrip::MouseMovedOutOfView() { | 161 void TabStrip::MouseMovedOutOfView() { |
| 162 ResizeLayoutTabs(); | 162 ResizeLayoutTabs(); |
| 163 } | 163 } |
| (...skipping 805 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 969 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const { | 969 int TabStrip::GetAvailableWidthForTabs(Tab* last_tab) const { |
| 970 return last_tab->x() + last_tab->width(); | 970 return last_tab->x() + last_tab->width(); |
| 971 } | 971 } |
| 972 | 972 |
| 973 bool TabStrip::IsPointInTab(Tab* tab, | 973 bool TabStrip::IsPointInTab(Tab* tab, |
| 974 const gfx::Point& point_in_tabstrip_coords) { | 974 const gfx::Point& point_in_tabstrip_coords) { |
| 975 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); | 975 gfx::Point point_in_tab_coords(point_in_tabstrip_coords); |
| 976 View::ConvertPointToView(this, tab, &point_in_tab_coords); | 976 View::ConvertPointToView(this, tab, &point_in_tab_coords); |
| 977 return tab->HitTest(point_in_tab_coords); | 977 return tab->HitTest(point_in_tab_coords); |
| 978 } | 978 } |
| OLD | NEW |