| 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/gtk/tabs/tab_strip_gtk.h" | 5 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "app/gfx/canvas_paint.h" | 9 #include "app/gfx/canvas_paint.h" |
| 10 #include "app/gtk_dnd_util.h" | 10 #include "app/gtk_dnd_util.h" |
| 11 #include "app/l10n_util.h" | |
| 12 #include "app/resource_bundle.h" | 11 #include "app/resource_bundle.h" |
| 13 #include "app/slide_animation.h" | 12 #include "app/slide_animation.h" |
| 13 #include "base/i18n/rtl.h" |
| 14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
| 15 #include "chrome/browser/autocomplete/autocomplete.h" | 15 #include "chrome/browser/autocomplete/autocomplete.h" |
| 16 #include "chrome/browser/browser_theme_provider.h" | 16 #include "chrome/browser/browser_theme_provider.h" |
| 17 #include "chrome/browser/gtk/browser_window_gtk.h" | 17 #include "chrome/browser/gtk/browser_window_gtk.h" |
| 18 #include "chrome/browser/gtk/custom_button.h" | 18 #include "chrome/browser/gtk/custom_button.h" |
| 19 #include "chrome/browser/gtk/gtk_theme_provider.h" | 19 #include "chrome/browser/gtk/gtk_theme_provider.h" |
| 20 #include "chrome/browser/gtk/gtk_util.h" | 20 #include "chrome/browser/gtk/gtk_util.h" |
| 21 #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" | 21 #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" |
| 22 #include "chrome/browser/profile.h" | 22 #include "chrome/browser/profile.h" |
| 23 #include "chrome/browser/tab_contents/tab_contents.h" | 23 #include "chrome/browser/tab_contents/tab_contents.h" |
| (...skipping 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1232 for (size_t i = 0; i < tab_data_.size(); ++i) { | 1232 for (size_t i = 0; i < tab_data_.size(); ++i) { |
| 1233 if (tab_data_[i].tab->mini()) | 1233 if (tab_data_[i].tab->mini()) |
| 1234 mini_count++; | 1234 mini_count++; |
| 1235 else | 1235 else |
| 1236 return mini_count; | 1236 return mini_count; |
| 1237 } | 1237 } |
| 1238 return mini_count; | 1238 return mini_count; |
| 1239 } | 1239 } |
| 1240 | 1240 |
| 1241 int TabStripGtk::GetAvailableWidthForTabs(TabGtk* last_tab) const { | 1241 int TabStripGtk::GetAvailableWidthForTabs(TabGtk* last_tab) const { |
| 1242 if (l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT) | 1242 if (!base::i18n::IsRTL()) |
| 1243 return last_tab->x() - bounds_.x() + last_tab->width(); | 1243 return last_tab->x() - bounds_.x() + last_tab->width(); |
| 1244 else | 1244 else |
| 1245 return bounds_.width() - last_tab->x(); | 1245 return bounds_.width() - last_tab->x(); |
| 1246 } | 1246 } |
| 1247 | 1247 |
| 1248 int TabStripGtk::GetIndexOfTab(const TabGtk* tab) const { | 1248 int TabStripGtk::GetIndexOfTab(const TabGtk* tab) const { |
| 1249 for (int i = 0, index = 0; i < GetTabCount(); ++i, ++index) { | 1249 for (int i = 0, index = 0; i < GetTabCount(); ++i, ++index) { |
| 1250 TabGtk* current_tab = GetTabAt(i); | 1250 TabGtk* current_tab = GetTabAt(i); |
| 1251 if (current_tab->closing()) { | 1251 if (current_tab->closing()) { |
| 1252 --index; | 1252 --index; |
| (...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2070 | 2070 |
| 2071 // Let the middle mouse button initiate clicks as well. | 2071 // Let the middle mouse button initiate clicks as well. |
| 2072 gtk_util::SetButtonTriggersNavigation(button->widget()); | 2072 gtk_util::SetButtonTriggersNavigation(button->widget()); |
| 2073 g_signal_connect(button->widget(), "clicked", | 2073 g_signal_connect(button->widget(), "clicked", |
| 2074 G_CALLBACK(OnNewTabClicked), this); | 2074 G_CALLBACK(OnNewTabClicked), this); |
| 2075 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); | 2075 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); |
| 2076 gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); | 2076 gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); |
| 2077 | 2077 |
| 2078 return button; | 2078 return button; |
| 2079 } | 2079 } |
| OLD | NEW |