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

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

Issue 8068020: Converts usage of GetBrowserViewForNativeWindow to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback, and make ShowPageInfo platform specific Created 9 years, 3 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
Index: chrome/browser/ui/views/tabs/dragged_tab_controller.cc
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
index ab7e994f9ab022d511baf762cf58ae80ce365360..ab44dd59c9f3964892f7fb12a0b38891f27f1c30 100644
--- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
@@ -649,14 +649,14 @@ void DraggedTabController::ContinueDragging() {
// guaranteed to be correct regardless of monitor config.
gfx::Point screen_point = GetCursorScreenPoint();
-#if defined(OS_LINUX)
- // We don't allow detaching in chrome os.
- BaseTabStrip* target_tabstrip = source_tabstrip_;
-#else
+#if defined(OS_WIN) && !defined(USE_AURA)
+ // Currently only allowed on windows (and not aura).
// Determine whether or not we have dragged over a compatible TabStrip in
// another browser window. If we have, we should attach to it and start
// dragging within it.
BaseTabStrip* target_tabstrip = GetTabStripForPoint(screen_point);
+#else
+ BaseTabStrip* target_tabstrip = source_tabstrip_;
#endif
if (target_tabstrip != attached_tabstrip_) {
// Make sure we're fully detached from whatever TabStrip we're attached to
@@ -774,6 +774,7 @@ DockInfo DraggedTabController::GetDockInfoAtPoint(
return info;
}
+#if defined(OS_WIN) && !defined(USE_AURA)
BaseTabStrip* DraggedTabController::GetTabStripForPoint(
const gfx::Point& screen_point) {
gfx::NativeView dragged_view = NULL;
@@ -803,6 +804,7 @@ BaseTabStrip* DraggedTabController::GetTabStripForPoint(
return NULL;
return GetTabStripIfItContains(other_tabstrip, screen_point);
}
+#endif
BaseTabStrip* DraggedTabController::GetTabStripIfItContains(
BaseTabStrip* tabstrip,

Powered by Google App Engine
This is Rietveld 408576698