Pull back windows to the original user desktop when clicking on the correspond window list bubble i…

chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.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/ash/launcher/chrome_launcher_app_menu_item_tab.h"
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "ui/events/event_constants.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
+#include "components/user_manager/user_manager.h"
+#endif
+
 ChromeLauncherAppMenuItemTab::ChromeLauncherAppMenuItemTab(
     const base::string16 title,
     const gfx::Image* icon,
     content::WebContents* content,
     bool has_leading_separator)
     : ChromeLauncherAppMenuItem(title, icon, has_leading_separator),
       content::WebContentsObserver(content) {
 }
 
 bool ChromeLauncherAppMenuItemTab::IsActive() const {
@@ skipping 12 matching lines @@
     return;
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   if (!browser)
     return;
   TabStripModel* tab_strip = browser->tab_strip_model();
   int index = tab_strip->GetIndexOfWebContents(web_contents());
   DCHECK_NE(index, TabStripModel::kNoTab);
   if (event_flags & (ui::EF_SHIFT_DOWN | ui::EF_MIDDLE_MOUSE_BUTTON)) {
     tab_strip->CloseWebContentsAt(index, TabStripModel::CLOSE_USER_GESTURE);
   } else {
+#if defined(OS_CHROMEOS)
+    // In multiprofile scenario we might need to teleport the window back to
+    // the current user desktop.
+    if (chrome::MultiUserWindowManager::GetMultiProfileMode() ==
+        chrome::MultiUserWindowManager::MULTI_PROFILE_MODE_SEPARATED) {
+      aura::Window* window = browser->window()->GetNativeWindow();
+      const user_manager::UserManager* user_manager =
+          user_manager::UserManager::Get();
+      const std::string& current_user =
+          user_manager->GetActiveUser()->GetUserID();
+      chrome::MultiUserWindowManager* window_manager =
+          chrome::MultiUserWindowManager::GetInstance();

[Mr4D (OOO till 08-26), 2015/04/30 21:51:44]

You could avoid using the user manager by checking if the window is on the owned
user's desktop:

if (!window_manager->IsWindowOnDesktopOfUser(window,
       window_manager->GetWindowOwner(window)) {

or alternatively

if (window_manager->GetUserPresentingWindow(window) != 
    window_manager->GetWindowOwner(window))) {

[xdai1, 2015/05/01 18:28:23]

Done.

+      if (!window_manager->IsWindowOnDesktopOfUser(window, current_user))
+        window_manager->ShowWindowForUser(window, current_user);
+    }
+#endif
     tab_strip->ActivateTabAt(index, false);
     browser->window()->Show();
     // Need this check to prevent unit tests from crashing.
     if (browser->window()->GetNativeWindow())
       ash::wm::ActivateWindow(browser->window()->GetNativeWindow());
   }
 }