Revert 96674 - Gtk: Make click target of tabs match their appearance.

chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc

Index: chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc	(revision 96939)
+++ chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc	(working copy)
@@ -750,8 +750,6 @@
                                  -1 };
   ui::SetDestTargetList(tabstrip_.get(), targets);
 
-  g_signal_connect(tabstrip_.get(), "map",
-                   G_CALLBACK(OnMapThunk), this);
   g_signal_connect(tabstrip_.get(), "expose-event",
                    G_CALLBACK(OnExposeThunk), this);
   g_signal_connect(tabstrip_.get(), "size-allocate",
@@ -1008,8 +1006,6 @@
   } else {
     Layout();
   }
-
-  ReStack();
 }
 
 void TabStripGtk::TabDetachedAt(TabContentsWrapper* contents, int index) {
@@ -1021,13 +1017,6 @@
   GetTabAt(index)->set_closing(true);
 }
 
-void TabStripGtk::ActiveTabChanged(TabContentsWrapper* old_contents,
-                                   TabContentsWrapper* new_contents,
-                                   int index,
-                                   bool user_gesture) {
-  ReStack();
-}
-
 void TabStripGtk::TabSelectionChanged(const TabStripSelectionModel& old_model) {
   // We have "tiny tabs" if the tabs are so tiny that the unselected ones are
   // a different size to the selected ones.
@@ -1086,7 +1075,6 @@
   tab_data_.insert(tab_data_.begin() + to_index, data);
   GenerateIdealBounds();
   StartMoveTabAnimation(from_index, to_index);
-  ReStack();
 }
 
 void TabStripGtk::TabChangedAt(TabContentsWrapper* contents, int index,
@@ -1592,26 +1580,6 @@
   return bds.Contains(cursor_point);
 }
 
-void TabStripGtk::ReStack() {
-  if (!GTK_WIDGET_REALIZED(tabstrip_.get())) {
-    // If the window isn't realized yet, we can't stack them yet. It will be
-    // done by the OnMap signal handler.
-    return;
-  }
-  int tab_count = GetTabCount();
-  TabGtk* active_tab = NULL;
-  for (int i = tab_count - 1; i >= 0; --i) {
-    TabGtk* tab = GetTabAt(i);
-    if (tab->IsActive())
-      active_tab = tab;
-    else
-      tab->Raise();
-  }
-  if (active_tab)
-    active_tab->Raise();
-}
-
-
 void TabStripGtk::AddMessageLoopObserver() {
   if (!added_as_message_loop_observer_) {
     MessageLoopForUI::current()->AddObserver(this);
@@ -1969,10 +1937,6 @@
     Layout();
 }
 
-void TabStripGtk::OnMap(GtkWidget* widget) {
-  ReStack();
-}
-
 gboolean TabStripGtk::OnExpose(GtkWidget* widget, GdkEventExpose* event) {
   if (gdk_region_empty(event->region))
     return TRUE;
Property changes on: chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
___________________________________________________________________
Deleted: svn:mergeinfo