summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/tabs
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 21:10:22 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-01 21:10:22 +0000
commitb7a763ad855baecbbf22a617164d5b5fd43ae899 (patch)
treeb5af064882a0dcf112e59378f7b2f3f01ca0bb06 /chrome/browser/views/tabs
parentae1eeb8d890e96db6ccb20e50e023c494fb9b024 (diff)
downloadchromium_src-b7a763ad855baecbbf22a617164d5b5fd43ae899.zip
chromium_src-b7a763ad855baecbbf22a617164d5b5fd43ae899.tar.gz
chromium_src-b7a763ad855baecbbf22a617164d5b5fd43ae899.tar.bz2
Fixes a couple of related bugs:
. gdk_display_get_pointer requires a display. . Don't do anything in NativeViewHostGtk if asked to remove and there is no native view. . Make NativeViewHostGtk deal with the native view already having the same parent. . Implement a couple of methods in NativeTabContentsContainerGtk. BUG=none TEST=none Review URL: http://codereview.chromium.org/115989 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tabs')
-rw-r--r--chrome/browser/views/tabs/dragged_tab_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index fb60b78..6f97a9c 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -1076,7 +1076,7 @@ gfx::Point DraggedTabController::GetCursorScreenPoint() const {
return gfx::Point(pt);
#else
gint x, y;
- gdk_display_get_pointer(NULL, NULL, &x, &y, NULL);
+ gdk_display_get_pointer(gdk_display_get_default(), NULL, &x, &y, NULL);
return gfx::Point(x, y);
#endif
}