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/gtk_dnd_util.h" | 9 #include "app/gtk_dnd_util.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1054 tab->StartMiniTabTitleAnimation(); | 1054 tab->StartMiniTabTitleAnimation(); |
1055 // We'll receive another notification of the change asynchronously. | 1055 // We'll receive another notification of the change asynchronously. |
1056 return; | 1056 return; |
1057 } | 1057 } |
1058 tab->UpdateData(contents->tab_contents(), | 1058 tab->UpdateData(contents->tab_contents(), |
1059 model_->IsAppTab(index), | 1059 model_->IsAppTab(index), |
1060 change_type == LOADING_ONLY); | 1060 change_type == LOADING_ONLY); |
1061 tab->UpdateFromModel(); | 1061 tab->UpdateFromModel(); |
1062 } | 1062 } |
1063 | 1063 |
1064 void TabStripGtk::TabReplacedAt(TabContentsWrapper* old_contents, | 1064 void TabStripGtk::TabReplacedAt(TabStripModel* tab_strip_model, |
| 1065 TabContentsWrapper* old_contents, |
1065 TabContentsWrapper* new_contents, | 1066 TabContentsWrapper* new_contents, |
1066 int index) { | 1067 int index) { |
1067 TabChangedAt(new_contents, index, ALL); | 1068 TabChangedAt(new_contents, index, ALL); |
1068 } | 1069 } |
1069 | 1070 |
1070 void TabStripGtk::TabMiniStateChanged(TabContentsWrapper* contents, int index) { | 1071 void TabStripGtk::TabMiniStateChanged(TabContentsWrapper* contents, int index) { |
1071 // Don't do anything if we've already picked up the change from TabMoved. | 1072 // Don't do anything if we've already picked up the change from TabMoved. |
1072 if (GetTabAt(index)->mini() == model_->IsMiniTab(index)) | 1073 if (GetTabAt(index)->mini() == model_->IsMiniTab(index)) |
1073 return; | 1074 return; |
1074 | 1075 |
(...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2053 | 2054 |
2054 // Let the middle mouse button initiate clicks as well. | 2055 // Let the middle mouse button initiate clicks as well. |
2055 gtk_util::SetButtonTriggersNavigation(button->widget()); | 2056 gtk_util::SetButtonTriggersNavigation(button->widget()); |
2056 g_signal_connect(button->widget(), "clicked", | 2057 g_signal_connect(button->widget(), "clicked", |
2057 G_CALLBACK(OnNewTabClickedThunk), this); | 2058 G_CALLBACK(OnNewTabClickedThunk), this); |
2058 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); | 2059 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); |
2059 gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); | 2060 gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); |
2060 | 2061 |
2061 return button; | 2062 return button; |
2062 } | 2063 } |
OLD | NEW |