Index: chrome/browser/ui/gtk/tabs/tab_gtk.cc |
=================================================================== |
--- chrome/browser/ui/gtk/tabs/tab_gtk.cc (revision 96939) |
+++ chrome/browser/ui/gtk/tabs/tab_gtk.cc (working copy) |
@@ -10,15 +10,12 @@ |
#include "base/utf_string_conversions.h" |
#include "chrome/app/chrome_command_ids.h" |
#include "chrome/browser/ui/gtk/accelerators_gtk.h" |
-#include "chrome/browser/ui/gtk/gtk_input_event_box.h" |
#include "chrome/browser/ui/gtk/menu_gtk.h" |
#include "chrome/browser/ui/gtk/tabs/tab_strip_menu_controller.h" |
#include "chrome/browser/ui/tabs/tab_menu_model.h" |
-#include "chrome/browser/ui/tabs/tab_resources.h" |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
#include "ui/base/dragdrop/gtk_dnd_util.h" |
-#include "ui/base/gtk/scoped_handle_gtk.h" |
#include "ui/base/models/accelerator_gtk.h" |
#include "ui/gfx/path.h" |
@@ -65,7 +62,8 @@ |
title_width_(0), |
ALLOW_THIS_IN_INITIALIZER_LIST(destroy_factory_(this)), |
ALLOW_THIS_IN_INITIALIZER_LIST(drag_end_factory_(this)) { |
- event_box_ = gtk_input_event_box_new(); |
+ event_box_ = gtk_event_box_new(); |
+ gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_), FALSE); |
g_signal_connect(event_box_, "button-press-event", |
G_CALLBACK(OnButtonPressEventThunk), this); |
g_signal_connect(event_box_, "button-release-event", |
@@ -99,12 +97,6 @@ |
} |
} |
-void TabGtk::Raise() const { |
- GdkWindow* window = gtk_input_event_box_get_window( |
- GTK_INPUT_EVENT_BOX(event_box_)); |
- gdk_window_raise(window); |
-} |
- |
gboolean TabGtk::OnButtonPressEvent(GtkWidget* widget, GdkEventButton* event) { |
// Every button press ensures either a button-release-event or a drag-fail |
// signal for |widget|. |
@@ -265,17 +257,6 @@ |
void TabGtk::SetBounds(const gfx::Rect& bounds) { |
TabRendererGtk::SetBounds(bounds); |
- |
- if (gtk_input_event_box_get_window(GTK_INPUT_EVENT_BOX(event_box_))) { |
- gfx::Path mask; |
- TabResources::GetHitTestMask(bounds.width(), bounds.height(), &mask); |
- ui::ScopedRegion region(mask.CreateNativeRegion()); |
- gdk_window_input_shape_combine_region( |
- gtk_input_event_box_get_window(GTK_INPUT_EVENT_BOX(event_box_)), |
- region.Get(), |
- 0, 0); |
- } |
- |
UpdateTooltipState(); |
} |
Property changes on: chrome/browser/ui/gtk/tabs/tab_gtk.cc |
___________________________________________________________________ |
Deleted: svn:mergeinfo |