Revert 66646 - Add "open as window" menu item to NTP app menu....

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc	(revision 66663)
+++ chrome/browser/ui/browser.cc	(working copy)
@@ -498,6 +498,8 @@
                                       const std::string& app_id,
                                       TabContents* existing_tab) {
   ExtensionsService* extensions_service = profile->GetExtensionsService();
+  if (!extensions_service->is_ready())
+    return NULL;
 
   // If the extension with |app_id| could't be found, most likely because it
   // was uninstalled.
@@ -520,11 +522,9 @@
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100);
 
+  // The app is not yet open.  Load it.
   switch (container) {
     case extension_misc::LAUNCH_WINDOW:
-      tab = Browser::OpenApplicationWindow(profile,
-                                           extension->GetFullLaunchURL());
-      break;
     case extension_misc::LAUNCH_PANEL:
       tab = Browser::OpenApplicationWindow(profile, extension, container,
                                            GURL());
@@ -588,7 +588,7 @@
 }
 
 // static
-TabContents* Browser::OpenApplicationWindow(Profile* profile, const GURL& url) {
+TabContents* Browser::OpenApplicationWindow(Profile* profile, GURL& url) {
   return OpenApplicationWindow(profile, NULL, extension_misc::LAUNCH_WINDOW,
                                url);
 }