Fixing drag and drop visibility issues of tabs on a visiting desktop

chrome/browser/ui/views/tabs/tab_drag_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/auto_reset.h"
@@ skipping 45 matching lines @@
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #endif
 
 #if defined(OS_WIN) && defined(USE_AURA)
 #include "ui/aura/window.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/multi_user_window_manager.h"
+#endif
+
 using content::OpenURLParams;
 using content::UserMetricsAction;
 using content::WebContents;
 
 static const int kHorizontalMoveThreshold = 16;  // Pixels.
 
 // Distance from the next/previous stacked before before we consider the tab
 // close enough to trigger moving.
 static const int kStackedDistance = 36;
 
@@ skipping 168 matching lines @@
 // position managed' property during a show and we need the property set to
 // false before WorkspaceLayoutManager sees the visibility change.
 class WindowPositionManagedUpdater : public views::WidgetObserver {
  public:
   virtual void OnWidgetVisibilityChanged(views::Widget* widget,
                                          bool visible) OVERRIDE {
     SetWindowPositionManaged(widget->GetNativeView(), false);
   }
 };
 
-}  // namespace
+// Being in the separate desktop multi profile mode, a visiting window from one
+// user should show all dragged off tabs on the current user's desktop. This
+// function transfers the visibility of a newly created browser accordingly.
+void MoveBrowserToCurrentUser(Browser* browser) {

[sky, 2013/10/31 22:04:04]

This feels wrong. Why do we have to special case every call site that is
creating a browser?

+#if defined(OS_CHROMEOS)
+  if (chrome::MultiUserWindowManager::GetMultiProfileMode() ==
+      chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_SEPARATED) {
+    chrome::MultiUserWindowManager* window_manager =
+        chrome::MultiUserWindowManager::GetInstance();
+    window_manager->ShowWindowForUser(browser->window()->GetNativeWindow(),
+                                      window_manager->current_user_id());
+  }
+#endif
+}
+
+} // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // DockDisplayer
 
 // DockDisplayer is responsible for giving the user a visual indication of a
 // possible dock position (as represented by DockInfo). DockDisplayer shows
 // a window with a DockView in it. Two animations are used that correspond to
 // the state of DockInfo::in_enable_area.
 class TabDragController::DockDisplayer : public gfx::AnimationDelegate {
  public:
@@ skipping 1729 matching lines @@
       item.web_contents = drag_data_[i].contents;
       item.add_types = drag_data_[i].pinned ? TabStripModel::ADD_PINNED
                                             : TabStripModel::ADD_NONE;
       contentses.push_back(item);
     }
 
     Browser* new_browser =
         GetModel(source_tabstrip_)->delegate()->CreateNewStripWithContents(
             contentses, window_bounds, dock_info_, widget->IsMaximized());
     ResetSelection(new_browser->tab_strip_model());
+    // Make sure that the window is shown on the correct users desktop.
+    MoveBrowserToCurrentUser(new_browser);
     new_browser->window()->Show();
 
     // Return the WebContents to normalcy.
     if (!detach_into_browser_)
       source_dragged_contents()->DecrementCapturerCount();
   }
 
   CleanUpHiddenFrame();
 }
 
@@ skipping 241 matching lines @@
 
   *drag_offset = point_in_screen - new_bounds.origin();
 
   Profile* profile =
       Profile::FromBrowserContext(drag_data_[0].contents->GetBrowserContext());
   Browser::CreateParams create_params(Browser::TYPE_TABBED,
                                       profile,
                                       host_desktop_type_);
   create_params.initial_bounds = new_bounds;
   Browser* browser = new Browser(create_params);
+  // Make sure that the window is shown on the correct users desktop.
+  MoveBrowserToCurrentUser(browser);
+
   is_dragging_new_browser_ = true;
   SetTrackedByWorkspace(browser->window()->GetNativeWindow(), false);
   SetWindowPositionManaged(browser->window()->GetNativeWindow(), false);
   // If the window is created maximized then the bounds we supplied are ignored.
   // We need to reset them again so they are honored.
   browser->window()->SetBounds(new_bounds);
 
   return browser;
 }
 
@@ skipping 20 matching lines @@
 gfx::Vector2d TabDragController::GetWindowOffset(
     const gfx::Point& point_in_screen) {
   TabStrip* owning_tabstrip = (attached_tabstrip_ && detach_into_browser_) ?
       attached_tabstrip_ : source_tabstrip_;
   views::View* toplevel_view = owning_tabstrip->GetWidget()->GetContentsView();
 
   gfx::Point point = point_in_screen;
   views::View::ConvertPointFromScreen(toplevel_view, &point);
   return point.OffsetFromOrigin();
 }