Disable the new window context menu option in the bookmarks extension for Windows 8 metro mode.

chrome/browser/extensions/extension_tabs_module.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/extensions/extension_tabs_module.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 59 matching lines @@
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 
 #if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "chrome/browser/ui/views/ash/panel_view_aura.h"
 #endif
 
+#if defined(OS_WIN)
+#include "base/win/metro.h"
+#endif  // OS_WIN
+
 namespace Get = extensions::api::windows::Get;
 namespace GetAll = extensions::api::windows::GetAll;
 namespace GetCurrent = extensions::api::windows::GetCurrent;
 namespace GetLastFocused = extensions::api::windows::GetLastFocused;
 namespace errors = extension_manifest_errors;
 namespace keys = extension_tabs_module_constants;
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
@@ skipping 118 matching lines @@
 
 QueryArg ParseBoolQueryArg(base::DictionaryValue* query, const char* key) {
   if (query->HasKey(key)) {
     bool value = false;
     CHECK(query->GetBoolean(key, &value));
     return value ? MATCH_TRUE : MATCH_FALSE;
   }
   return NOT_SET;
 }
 
+Browser* CreateBrowserWindow(const Browser::CreateParams& params,
+                             Profile* profile,
+                             const std::string& extension_id) {
+  bool use_existing_browser_window = false;
+
+#if defined(OS_WIN)
+  // In Windows 8 metro mode we only allow new windows to be created if the
+  // extension id is valid in which case it is created as an application window
+  if (extension_id.empty() && base::win::GetMetroModule())
+    use_existing_browser_window = true;
+#endif  // OS_WIN
+
+  Browser* new_window = NULL;
+  if (use_existing_browser_window)
+    new_window = browser::FindTabbedBrowser(profile, false);

[Aaron Boodman, 2012/06/06 01:46:26]

Document the magic boolean or make it a named constant.

[ananta, 2012/06/06 01:52:22]

Done.

+
+  if (!new_window)
+    Browser* new_window = Browser::CreateWithParams(params);
+  return new_window;
+}
+
 }  // namespace
 
 // Windows ---------------------------------------------------------------------
 
 bool GetWindowFunction::RunImpl() {
   scoped_ptr<Get::Params> params(Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   bool populate_tabs = false;
   if (params->get_info.get() && params->get_info->populate.get())
@@ skipping 350 matching lines @@
     create_params = Browser::CreateParams(window_type, window_profile);
     create_params.initial_bounds = window_bounds;
   } else {
     create_params = Browser::CreateParams::CreateForApp(
         window_type,
         web_app::GenerateApplicationNameFromExtensionId(extension_id),
         (window_type == Browser::TYPE_PANEL ? panel_bounds : popup_bounds),
         window_profile);
   }
   create_params.initial_show_state = ui::SHOW_STATE_NORMAL;
-  Browser* new_window = Browser::CreateWithParams(create_params);
+
+  Browser* new_window = CreateBrowserWindow(create_params, window_profile,
+                                            extension_id);
 
   for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) {
     TabContentsWrapper* tab = new_window->AddSelectedTabWithURL(
         *i, content::PAGE_TRANSITION_LINK);
     if (window_type == Browser::TYPE_PANEL)
       tab->extension_tab_helper()->SetExtensionAppIconById(extension_id);
   }
   if (contents) {
     TabStripModel* target_tab_strip = new_window->tab_strip_model();
     target_tab_strip->InsertTabContentsAt(urls.size(), contents,
@@ skipping 1185 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }