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_browser.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_browser.h"
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/chrome_notification_types.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 "content/public/browser/notification_service.h"
 #include "ui/events/event_constants.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
+#endif
+
 ChromeLauncherAppMenuItemBrowser::ChromeLauncherAppMenuItemBrowser(
     const base::string16 title,
     const gfx::Image* icon,
     Browser* browser,
     bool has_leading_separator)
     : ChromeLauncherAppMenuItem(title, icon, has_leading_separator),
       browser_(browser) {
   DCHECK(browser);
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_CLOSING,
                  content::Source<Browser>(browser));
 }
 ChromeLauncherAppMenuItemBrowser::~ChromeLauncherAppMenuItemBrowser() {
 }
 
 bool ChromeLauncherAppMenuItemBrowser::IsActive() const {
   return browser_ == chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
 }
 
 bool ChromeLauncherAppMenuItemBrowser::IsEnabled() const {
   return true;
 }
 
 void ChromeLauncherAppMenuItemBrowser::Execute(int event_flags) {
   if (browser_) {
     if (event_flags & (ui::EF_SHIFT_DOWN | ui::EF_MIDDLE_MOUSE_BUTTON)) {
       TabStripModel* tab_strip = browser_->tab_strip_model();
       tab_strip->CloseAllTabs();
     } else {
+#if defined(OS_CHROMEOS)
+      // In ChromeOS 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) {

[Mr4D (OOO till 08-26), 2015/05/03 19:53:44]

Since this is the same code as in the other cc module you might want create a
new multi_user_util function for it. With that you would then even able to get
rid of the #if defined ... here.

[xdai1, 2015/05/04 16:54:56]

Found an existing function... Used it instead.

+        aura::Window* window = browser_->window()->GetNativeWindow();
+        chrome::MultiUserWindowManager* window_manager =
+            chrome::MultiUserWindowManager::GetInstance();
+        if (!window_manager->IsWindowOnDesktopOfUser(
+                window, window_manager->GetWindowOwner(window)))

[Mr4D (OOO till 08-26), 2015/05/03 19:53:44]

same here

+          window_manager->ShowWindowForUser(
+              window, window_manager->GetWindowOwner(window));
+      }
+#endif
       browser_->window()->Show();
       ash::wm::ActivateWindow(browser_->window()->GetNativeWindow());
     }
   }
 }
 
 void ChromeLauncherAppMenuItemBrowser::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_BROWSER_CLOSING:
       DCHECK_EQ(browser_, content::Source<Browser>(source).ptr());
       browser_ = NULL;
       break;
 
     default:
       NOTREACHED();
   }
 }