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

chrome/browser/ui/views/frame/system_menu_model_builder.cc

 // Copyright (c) 2013 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/frame/system_menu_model_builder.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/host_desktop.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/models/simple_menu_model.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "components/user_manager/user_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #endif
 
+namespace {
+
+// Check if the current window is chrome settings app or popup window.
+bool IsChromeSettingsAppOrPopupWindow(Browser* browser) {
+  const base::string16 kChromeSetting =
+      base::ASCIIToUTF16(content::kChromeUIScheme) +
+      base::ASCIIToUTF16(url::kStandardSchemeSeparator) +
+      base::ASCIIToUTF16(chrome::kChromeUISettingsHost);

[Peter Kasting, 2015/05/06 10:49:50]

Don't do things this way.

Instead, get the URL below as a GURL (not a string) and check its scheme() and
host() against the constants here.

+
+  if (browser) {
+    TabStripModel* tab_strip = browser->tab_strip_model();
+    DCHECK_EQ(1, tab_strip->count());
+    const base::string16 gurl_spec = base::UTF8ToUTF16(
+        tab_strip->GetWebContentsAt(0)->GetURL().spec());
+    if (gurl_spec.find(kChromeSetting) != base::string16::npos)
+      return true;
+  }
+  return false;
+}
+
+}  // namespace
+
 SystemMenuModelBuilder::SystemMenuModelBuilder(
     ui::AcceleratorProvider* provider,
     Browser* browser)
     : menu_delegate_(provider, browser) {
 }
 
 SystemMenuModelBuilder::~SystemMenuModelBuilder() {
 }
 
 void SystemMenuModelBuilder::Init() {
@@ skipping 63 matching lines @@
                                 encoding_menu_contents_.get());
   if (browser()->is_app() && chrome::CanOpenTaskManager()) {
     model->AddSeparator(ui::NORMAL_SEPARATOR);
     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   }
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   model->AddSeparator(ui::NORMAL_SEPARATOR);
   model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
 #endif
 
-  AppendTeleportMenu(model);
+  // We don't append teleport menu for Chrome Settings window.

[Peter Kasting, 2015/05/12 20:18:46]

Nit: Expand this comment to explain why it doesn't make sense to do this for
this window.

+  if (!IsChromeSettingsAppOrPopupWindow(browser()))
+    AppendTeleportMenu(model);
 }
 
 void SystemMenuModelBuilder::AddFrameToggleItems(ui::SimpleMenuModel* model) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDebugEnableFrameToggle)) {
     model->AddSeparator(ui::NORMAL_SEPARATOR);
     model->AddItem(IDC_DEBUG_FRAME_TOGGLE,
                    base::ASCIIToUTF16("Toggle Frame Type"));
   }
 }
@@ skipping 33 matching lines @@
     const user_manager::UserInfo* user_info = delegate->GetUserInfo(user_index);
     model->AddItem(
         user_index == 1 ? IDC_VISIT_DESKTOP_OF_LRU_USER_2
                         : IDC_VISIT_DESKTOP_OF_LRU_USER_3,
         l10n_util::GetStringFUTF16(IDS_VISIT_DESKTOP_OF_LRU_USER,
                                    user_info->GetDisplayName(),
                                    base::ASCIIToUTF16(user_info->GetEmail())));
   }
 #endif
 }