| 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/gtk/tabs/tab_strip_gtk.h" | 5 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 | 8 | 
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" | 
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 21 #include "chrome/browser/ui/gtk/custom_button.h" | 21 #include "chrome/browser/ui/gtk/custom_button.h" | 
| 22 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | 22 #include "chrome/browser/ui/gtk/gtk_theme_service.h" | 
| 23 #include "chrome/browser/ui/gtk/gtk_util.h" | 23 #include "chrome/browser/ui/gtk/gtk_util.h" | 
| 24 #include "chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h" | 24 #include "chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h" | 
| 25 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 25 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 
| 26 #include "content/browser/tab_contents/tab_contents.h" | 26 #include "content/browser/tab_contents/tab_contents.h" | 
| 27 #include "content/common/notification_service.h" | 27 #include "content/common/notification_service.h" | 
| 28 #include "content/common/notification_type.h" | 28 #include "content/common/notification_type.h" | 
| 29 #include "grit/app_resources.h" | 29 #include "grit/app_resources.h" | 
| 30 #include "grit/theme_resources.h" | 30 #include "grit/theme_resources.h" | 
|  | 31 #include "grit/theme_resources_standard.h" | 
| 31 #include "ui/base/animation/animation_delegate.h" | 32 #include "ui/base/animation/animation_delegate.h" | 
| 32 #include "ui/base/animation/slide_animation.h" | 33 #include "ui/base/animation/slide_animation.h" | 
| 33 #include "ui/base/dragdrop/gtk_dnd_util.h" | 34 #include "ui/base/dragdrop/gtk_dnd_util.h" | 
| 34 #include "ui/base/resource/resource_bundle.h" | 35 #include "ui/base/resource/resource_bundle.h" | 
| 35 #include "ui/gfx/gtk_util.h" | 36 #include "ui/gfx/gtk_util.h" | 
| 36 #include "ui/gfx/point.h" | 37 #include "ui/gfx/point.h" | 
| 37 | 38 | 
| 38 namespace { | 39 namespace { | 
| 39 | 40 | 
| 40 const int kDefaultAnimationDurationMs = 100; | 41 const int kDefaultAnimationDurationMs = 100; | 
| (...skipping 2016 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2057 | 2058 | 
| 2058   // Let the middle mouse button initiate clicks as well. | 2059   // Let the middle mouse button initiate clicks as well. | 
| 2059   gtk_util::SetButtonTriggersNavigation(button->widget()); | 2060   gtk_util::SetButtonTriggersNavigation(button->widget()); | 
| 2060   g_signal_connect(button->widget(), "clicked", | 2061   g_signal_connect(button->widget(), "clicked", | 
| 2061                    G_CALLBACK(OnNewTabClickedThunk), this); | 2062                    G_CALLBACK(OnNewTabClickedThunk), this); | 
| 2062   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); | 2063   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); | 
| 2063   gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); | 2064   gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); | 
| 2064 | 2065 | 
| 2065   return button; | 2066   return button; | 
| 2066 } | 2067 } | 
| OLD | NEW | 
|---|