Add "open as window" menu item to NTP app menu.

chrome/browser/browser_browsertest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/sys_info.h"
@@ skipping 555 matching lines @@
 // menu is showing.
 IN_PROC_BROWSER_TEST_F(BrowserTest, CloseWithAppMenuOpen) {
   if (browser_defaults::kBrowserAliveWithNoWindows)
     return;
 
   // We need a message loop running for menus on windows.
   MessageLoop::current()->PostTask(FROM_HERE,
                                    new RunCloseWithAppMenuTask(browser()));
 }
 
+#if !defined(OS_MACOSX)
+IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) {
+  ASSERT_TRUE(test_server()->Start());
+
+  // Load an app
+  host_resolver()->AddRule("www.example.com", "127.0.0.1");
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
+  const Extension* extension_app = GetExtension();
+
+  // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
+  TabContents* app_window = Browser::OpenApplication(
+      browser()->profile(), extension_app, extension_misc::LAUNCH_WINDOW, NULL);
+  ASSERT_TRUE(app_window);
+
+  // Apps launched in a window from the NTP do not have extension_app set in
+  // tab contents.
+  EXPECT_FALSE(app_window->extension_app());
+  EXPECT_EQ(extension_app->GetFullLaunchURL(), app_window->GetURL());
+
+  // The launch should have created a new browser.
+  ASSERT_EQ(2u, BrowserList::GetBrowserCount(browser()->profile()));
+
+  // Find the new browser.
+  Browser* new_browser = NULL;
+  for (BrowserList::const_iterator i = BrowserList::begin();
+       i != BrowserList::end() && !new_browser; ++i) {
+    if (*i != browser())
+      new_browser = *i;
+  }
+  ASSERT_TRUE(new_browser);
+  ASSERT_TRUE(new_browser != browser());
+
+  EXPECT_EQ(Browser::TYPE_APP, new_browser->type());
+}
+#endif  // !defined(OS_MACOSX)
+
 // TODO(ben): this test was never enabled. It has bit-rotted since being added.
 // It originally lived in browser_unittest.cc, but has been moved here to make
 // room for real browser unit tests.
 #if 0
 class BrowserTest2 : public InProcessBrowserTest {
  public:
   BrowserTest2() {
     host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
     // Avoid making external DNS lookups. In this test we don't need this
     // to succeed.
@@ skipping 64 matching lines @@
 
   // The normal browser should now have four.
   EXPECT_EQ(4, browser()->tab_count());
 
   // Close the additional browsers.
   popup_browser->CloseAllTabs();
   app_browser->CloseAllTabs();
   app_popup_browser->CloseAllTabs();
 }
 #endif