Chromium Code Reviews| Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc |
| diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc |
| index 2fbf5ed41cd1eb1e1f0c290d468c9783c0c3b51c..1e2d451dfeac38c2250f274d5384a84348b02d5e 100644 |
| --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc |
| +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc |
| @@ -1795,12 +1795,12 @@ gfx::NativeWindow TabDragController::GetLocalProcessWindow( |
| const gfx::Point& screen_point, |
| bool exclude_dragged_view) { |
| std::set<gfx::NativeWindow> exclude; |
| - if (exclude_dragged_view) { |
| - gfx::NativeWindow dragged_window = |
| - attached_tabstrip_->GetWidget()->GetNativeWindow(); |
| - if (dragged_window) |
| - exclude.insert(dragged_window); |
| - } |
| + gfx::NativeWindow dragged_window = |
| + attached_tabstrip_->GetWidget()->GetNativeWindow(); |
| + if (exclude_dragged_view && dragged_window) |
| + exclude.insert(dragged_window); |
| + gfx::NativeWindow root_window = |
| + dragged_window ? dragged_window->GetRootWindow() : nullptr; |
|
sky
2015/11/06 17:26:56
This is aura specific right? Can we instead pass i
bshe
2015/11/06 21:13:21
Done.
|
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| // Exclude windows which are pending deletion via Browser::TabStripEmpty(). |
| // These windows can be returned in the Linux Aura port because the browser |
| @@ -1815,8 +1815,6 @@ gfx::NativeWindow TabDragController::GetLocalProcessWindow( |
| exclude.insert((*it)->window()->GetNativeWindow()); |
| } |
| #endif |
| - return GetLocalProcessWindowAtPoint(host_desktop_type_, |
| - screen_point, |
| - exclude); |
| - |
| + return GetLocalProcessWindowAtPoint(host_desktop_type_, screen_point, exclude, |
| + root_window); |
| } |