gtk: Move the enter/leave-notify-event handling to TabRendererGtk and hook up...

chrome/browser/gtk/tabs/tab_gtk.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/tabs/tab_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
@@ skipping 103 matching lines @@
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_), FALSE);
   gtk_drag_source_set(event_box_, GDK_BUTTON1_MASK,
                       NULL, 0, GDK_ACTION_MOVE);
   GtkDndUtil::SetSourceTargetListFromCodeMask(event_box_,
                                               GtkDndUtil::CHROME_TAB);
   g_signal_connect(G_OBJECT(event_box_), "button-press-event",
                    G_CALLBACK(OnMousePress), this);
   g_signal_connect(G_OBJECT(event_box_), "button-release-event",
                    G_CALLBACK(OnMouseRelease), this);
   g_signal_connect(G_OBJECT(event_box_), "enter-notify-event",
-                   G_CALLBACK(OnEnterNotify), this);
+                   G_CALLBACK(OnEnterNotifyEvent), this);
   g_signal_connect(G_OBJECT(event_box_), "leave-notify-event",
-                   G_CALLBACK(OnLeaveNotify), this);
+                   G_CALLBACK(OnLeaveNotifyEvent), this);
   g_signal_connect_after(G_OBJECT(event_box_), "drag-begin",
                            G_CALLBACK(OnDragBegin), this);
   g_signal_connect_after(G_OBJECT(event_box_), "drag-end",
                          G_CALLBACK(OnDragEnd), this);
   g_signal_connect_after(G_OBJECT(event_box_), "drag-failed",
                            G_CALLBACK(OnDragFailed), this);
   gtk_widget_add_events(event_box_,
         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
         GDK_LEAVE_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
   gtk_container_add(GTK_CONTAINER(event_box_), TabRendererGtk::widget());
@@ skipping 39 matching lines @@
       event->x >= 0 && event->y >= 0 &&
       event->x < widget->allocation.width &&
       event->y < widget->allocation.height) {
     tab->delegate_->CloseTab(tab);
   }
 
   return TRUE;
 }
 
 // static
-gboolean TabGtk::OnEnterNotify(GtkWidget* widget, GdkEventCrossing* event,
-                               TabGtk* tab) {
-  tab->OnMouseEntered();
-  return TRUE;
-}
-
-// static
-gboolean TabGtk::OnLeaveNotify(GtkWidget* widget, GdkEventCrossing* event,
-                               TabGtk* tab) {
-  tab->OnMouseExited();
-  return TRUE;
-}
-
-// static
 void TabGtk::OnDragBegin(GtkWidget* widget, GdkDragContext* context,
                          TabGtk* tab) {
   MessageLoopForUI::current()->AddObserver(tab);
 
   int x, y;
   gdk_window_get_pointer(tab->event_box_->window, &x, &y, NULL);
 
   // Make the mouse coordinate relative to the tab.
   x -= tab->bounds().x();
   y -= tab->bounds().y();
@@ skipping 101 matching lines @@
   if (!menu_controller_.get())
     menu_controller_.reset(new ContextMenuController(this));
 
   menu_controller_->RunMenu();
 }
 
 void TabGtk::ContextMenuClosed() {
   delegate()->StopAllHighlighting();
   menu_controller_.reset();
 }