Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc

Issue 7049014: Revert part of r82614 which regressed dropping stuff onto the tabstrip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1965 matching lines...) Expand 10 before | Expand all | Expand 10 after
1976 gtk_drag_finish(context, FALSE, FALSE, time); 1976 gtk_drag_finish(context, FALSE, FALSE, time);
1977 else 1977 else
1978 gtk_drag_get_data(widget, context, target, time); 1978 gtk_drag_get_data(widget, context, target, time);
1979 1979
1980 return TRUE; 1980 return TRUE;
1981 } 1981 }
1982 1982
1983 gboolean TabStripGtk::OnDragLeave(GtkWidget* widget, GdkDragContext* context, 1983 gboolean TabStripGtk::OnDragLeave(GtkWidget* widget, GdkDragContext* context,
1984 guint time) { 1984 guint time) {
1985 // Destroy the drop indicator. 1985 // Destroy the drop indicator.
1986 drop_info_.reset(); 1986 drop_info_->DestroyContainer();
1987 1987
1988 // Cancel any pending tab transition. 1988 // Cancel any pending tab transition.
1989 hover_tab_selector_.CancelTabTransition(); 1989 hover_tab_selector_.CancelTabTransition();
1990 1990
1991 return FALSE; 1991 return FALSE;
1992 } 1992 }
1993 1993
1994 gboolean TabStripGtk::OnDragDataReceived(GtkWidget* widget, 1994 gboolean TabStripGtk::OnDragDataReceived(GtkWidget* widget,
1995 GdkDragContext* context, 1995 GdkDragContext* context,
1996 gint x, gint y, 1996 gint x, gint y,
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
2076 2076
2077 // Let the middle mouse button initiate clicks as well. 2077 // Let the middle mouse button initiate clicks as well.
2078 gtk_util::SetButtonTriggersNavigation(button->widget()); 2078 gtk_util::SetButtonTriggersNavigation(button->widget());
2079 g_signal_connect(button->widget(), "clicked", 2079 g_signal_connect(button->widget(), "clicked",
2080 G_CALLBACK(OnNewTabClickedThunk), this); 2080 G_CALLBACK(OnNewTabClickedThunk), this);
2081 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS); 2081 GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
2082 gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0); 2082 gtk_fixed_put(GTK_FIXED(tabstrip_.get()), button->widget(), 0, 0);
2083 2083
2084 return button; 2084 return button;
2085 } 2085 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698