Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6887)

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller.cc

Issue 1562843002: Revert of Introduces window_finder_android.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/views/tabs/window_finder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 10e95206af67697e4b6f6b162c698539346b9f4a..8542c625dcf8faa0cfb83df646aa88a7d9115edc 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -1800,10 +1800,12 @@ gfx::NativeWindow TabDragController::GetLocalProcessWindow(
const gfx::Point& screen_point,
bool exclude_dragged_view) {
std::set<gfx::NativeWindow> exclude;
- gfx::NativeWindow dragged_window =
- attached_tabstrip_->GetWidget()->GetNativeWindow();
- if (exclude_dragged_view && dragged_window)
- exclude.insert(dragged_window);
+ if (exclude_dragged_view) {
+ gfx::NativeWindow dragged_window =
+ attached_tabstrip_->GetWidget()->GetNativeWindow();
+ if (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
@@ -1818,6 +1820,8 @@ gfx::NativeWindow TabDragController::GetLocalProcessWindow(
exclude.insert((*it)->window()->GetNativeWindow());
}
#endif
- return GetLocalProcessWindowAtPoint(host_desktop_type_, screen_point, exclude,
- dragged_window);
+ return GetLocalProcessWindowAtPoint(host_desktop_type_,
+ screen_point,
+ exclude);
+
}
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/views/tabs/window_finder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698