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..c911022af464ad022be74c3bd47cd5575f3e3457 100644 |
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc |
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc |
@@ -1795,12 +1795,10 @@ 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); |
#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 +1813,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, |
+ dragged_window); |
} |