| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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_gtk.h" | 5 #include "chrome/browser/gtk/tabs/tab_gtk.h" |
| 6 | 6 |
| 7 #include "app/gfx/path.h" |
| 7 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
| 9 #include "chrome/browser/gtk/custom_button.h" | 10 #include "chrome/browser/gtk/custom_button.h" |
| 10 #include "chrome/browser/gtk/menu_gtk.h" | 11 #include "chrome/browser/gtk/menu_gtk.h" |
| 11 #include "chrome/common/gfx/path.h" | |
| 12 #include "grit/generated_resources.h" | 12 #include "grit/generated_resources.h" |
| 13 #include "grit/theme_resources.h" | 13 #include "grit/theme_resources.h" |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 // The targets available for drag n' drop. | 17 // The targets available for drag n' drop. |
| 18 GtkTargetEntry target_table[] = { | 18 GtkTargetEntry target_table[] = { |
| 19 { const_cast<char*>("application/x-chrome-tab"), GTK_TARGET_SAME_APP, 0 } | 19 { const_cast<char*>("application/x-chrome-tab"), GTK_TARGET_SAME_APP, 0 } |
| 20 }; | 20 }; |
| 21 | 21 |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE); | 267 IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE); |
| 268 | 268 |
| 269 g_signal_connect(G_OBJECT(button->widget()), "clicked", | 269 g_signal_connect(G_OBJECT(button->widget()), "clicked", |
| 270 G_CALLBACK(OnCloseButtonClicked), this); | 270 G_CALLBACK(OnCloseButtonClicked), this); |
| 271 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); | 271 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); |
| 272 gtk_fixed_put(GTK_FIXED(TabRendererGtk::widget()), button->widget(), 0, 0); | 272 gtk_fixed_put(GTK_FIXED(TabRendererGtk::widget()), button->widget(), 0, 0); |
| 273 gtk_widget_show(button->widget()); | 273 gtk_widget_show(button->widget()); |
| 274 | 274 |
| 275 return button; | 275 return button; |
| 276 } | 276 } |
| OLD | NEW |