Chrome OS: New window on teleported browser window should show on current desktop

chrome/browser/ui/browser_navigator.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/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 21 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/features/features.h"
 
 #if defined(USE_ASH)
-#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "components/signin/core/account_id/account_id.h"
 #endif
 
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #endif
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/web_applications/web_app.h"
@@ skipping 377 matching lines @@
     params->disposition =
         source_browser->window()->GetDispositionForPopupBounds(
             params->window_bounds);
   }
 
   params->browser = GetBrowserForDisposition(params);
   if (!params->browser)
     return;
 
 #if defined(USE_ASH)
-  if (source_browser && source_browser != params->browser) {
-    // When the newly created browser was spawned by a browser which visits
-    // another user's desktop, it should be shown on the same desktop as the
-    // originating one. (This is part of the desktop separation per profile).
-    MultiUserWindowManager* manager = MultiUserWindowManager::GetInstance();
-    // Some unit tests have no manager instantiated.
-    if (manager) {
-      aura::Window* src_window = source_browser->window()->GetNativeWindow();
-      aura::Window* new_window = params->browser->window()->GetNativeWindow();
-      const AccountId& src_account_id =
-          manager->GetUserPresentingWindow(src_window);
-      if (src_account_id != manager->GetUserPresentingWindow(new_window)) {
-        // Once the window gets presented, it should be shown on the same
-        // desktop as the desktop of the creating browser. Note that this
-        // command will not show the window if it wasn't shown yet by the
-        // browser creation.
-        manager->ShowWindowForUser(new_window, src_account_id);
-      }
-    }
-  }
+  // In ChromeOS multiprofile scenario we might need to teleport the window back
+  // to the current user desktop.
+  aura::Window* new_window = params->browser->window()->GetNativeWindow();
+  multi_user_util::MoveWindowToCurrentDesktop(new_window);

[sky, 2017/01/20 01:03:08]

This seems wrong to me. When we create the browser don't we supply context that
corresponds to the active desktop so that it appears in the right place?

[oshima, 2017/01/24 21:22:58]

I agree. warx@, please see my comment in the bug.

[Mr4D (OOO till 08-26), 2017/01/25 18:08:44]

If I remember it correctly there was the possibility that a chrome window on a
desktop of a (could be hidden) user spawned another window and that should show
up on the desktop on where the chrome window is. So e.g.: User clicks on query -
which processes the result for a second in which the user switches to another
desktop. Then the resulting window shows up - but it should be presented on the
desktop of the originating browser - not the current one.

 #endif
 
   // Navigate() must not return early after this point.
 
   if (GetSourceProfile(params) != params->browser->profile()) {
     // A tab is being opened from a link from a different profile, we must reset
     // source information that may cause state to be shared.
     params->source_contents = nullptr;
     params->source_site_instance = nullptr;
     params->referrer = content::Referrer();
@@ skipping 197 matching lines @@
   bool reverse_on_redirect = false;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url, browser_context, &reverse_on_redirect);
 
   // Some URLs are mapped to uber subpages. Do not allow them in incognito.
   return !(rewritten_url.scheme_piece() == content::kChromeUIScheme &&
            rewritten_url.host_piece() == chrome::kChromeUIUberHost);
 }
 
 }  // namespace chrome