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

Index: chrome/browser/ui/views/frame/system_menu_model_builder.cc
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
index e877f978abed33e58fd8ba5a01dc8e57f4dec52a..fb7d225cf5172112cfb6de1cb4ded43218e14171 100644
--- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc
+++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
@@ -9,8 +9,10 @@
 #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"
@@ -25,6 +27,28 @@
 #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)
@@ -108,7 +132,9 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPopupWindow(
   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) {