Index: chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc |
diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc |
index bfb1a1077c92547e238b5ebe0650344dd1b2c3cf..268b588f630c25849521d3a97df02518c61d8439 100644 |
--- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc |
+++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc |
@@ -505,9 +505,9 @@ void DraggedTabControllerGtk::Detach() { |
gfx::Point DraggedTabControllerGtk::ConvertScreenPointToTabStripPoint( |
TabStripGtk* tabstrip, const gfx::Point& screen_point) { |
- gfx::Point tabstrip_screen_point = |
- ui::GetWidgetScreenPosition(tabstrip->tabstrip_.get()); |
- return screen_point.Subtract(tabstrip_screen_point); |
+ gfx::Vector2d tabstrip_screen_offset = |
+ ui::GetWidgetScreenOffset(tabstrip->tabstrip_.get()); |
+ return screen_point.Subtract(tabstrip_screen_offset); |
} |
gfx::Rect DraggedTabControllerGtk::GetDraggedViewTabStripBounds( |
@@ -817,8 +817,8 @@ gfx::Rect DraggedTabControllerGtk::GetAnimateBounds() { |
gfx::Rect bounds = tab->GetRequisition(); |
GtkWidget* widget = tab->widget(); |
GtkWidget* parent = gtk_widget_get_parent(widget); |
- gfx::Point point = ui::GetWidgetScreenPosition(parent); |
- bounds.Offset(point); |
+ gfx::Vector2d offset = ui::GetWidgetScreenOffset(parent); |
danakj
2012/10/29 19:17:20
inlined
|
+ bounds.Offset(offset); |
return gfx::Rect(bounds.x(), bounds.y(), |
dragged_view_->GetTotalWidthInTabStrip(), bounds.height()); |