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

chrome/browser/dom_ui/app_launcher_handler.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 "chrome/browser/dom_ui/app_launcher_handler.h"
 
 #include "app/animation.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 172 matching lines @@
     default_apps->DidShowPromo();
     promo_active_ = true;
   } else {
     dictionary->SetBoolean("showPromo", false);
     promo_active_ = false;
   }
 
   bool showLauncher =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppLauncher);
   dictionary->SetBoolean("showLauncher", showLauncher);
-
-#if defined(OS_MACOSX)
-  // App windows are not yet implemented on mac.
-  bool disable_app_window_launch = true;
-#else
-  bool disable_app_window_launch = false;
-#endif
-  dictionary->SetBoolean("disableAppWindowLaunch", disable_app_window_launch);
 }
 
 void AppLauncherHandler::HandleGetApps(const ListValue* args) {
   DictionaryValue dictionary;
   FillAppDictionary(&dictionary);
   dom_ui_->CallJavascriptFunction(L"getAppsCallback", dictionary);
 
   // First time we get here we set up the observer so that we can tell update
   // the apps as they change.
   if (registrar_.IsEmpty()) {
@@ skipping 38 matching lines @@
   Profile* profile = extensions_service_->profile();
 
   // To give a more "launchy" experience when using the NTP launcher, we close
   // it automatically.
   Browser* browser = BrowserList::GetLastActive();
   TabContents* old_contents = NULL;
   if (browser)
     old_contents = browser->GetSelectedTabContents();
 
   AnimateAppIcon(extension, rect);
-
-  extension_misc::LaunchContainer launch_container =
-      extension->launch_container();
-  ExtensionPrefs::LaunchType prefs_launch_type =
-      extensions_service_->extension_prefs()->GetLaunchType(extension_id);
-
-  // If the user chose to open in a window, change the container type.
-  if (prefs_launch_type == ExtensionPrefs::LAUNCH_WINDOW)
-    launch_container = extension_misc::LAUNCH_WINDOW;
-
   TabContents* new_contents = Browser::OpenApplication(
-      profile, extension, launch_container, old_contents);
+      profile, extension, extension->launch_container(), old_contents);
 
   if (new_contents != old_contents && browser->tab_count() > 1)
     browser->CloseTabContents(old_contents);
 
   if (extension_id != extension_misc::kWebStoreAppId)
     RecordAppLaunch(promo_active_);
 }
 
 void AppLauncherHandler::HandleSetLaunchType(const ListValue* args) {
   std::string extension_id;
@@ skipping 40 matching lines @@
 
   for (ExtensionIdSet::const_iterator iter = app_ids->begin();
        iter != app_ids->end(); ++iter) {
     if (extensions_service_->GetExtensionById(*iter, true))
       extensions_service_->UninstallExtension(*iter, false);
   }
 
   extensions_service_->default_apps()->SetPromoHidden();
 }
 
-// static
+//static
 void AppLauncherHandler::RecordWebStoreLaunch(bool promo_active) {
   if (!promo_active) return;
 
   UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppsPromoHistogram,
                             extension_misc::PROMO_LAUNCH_WEB_STORE,
                             extension_misc::PROMO_BUCKET_BOUNDARY);
 }
 
-// static
+//static
 void AppLauncherHandler::RecordAppLaunch(bool promo_active) {
   // TODO(jstritar): record app launches that occur when the promo is not
   // active using a different histogram.
 
   if (!promo_active) return;
 
   UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppsPromoHistogram,
                             extension_misc::PROMO_LAUNCH_APP,
                             extension_misc::PROMO_BUCKET_BOUNDARY);
 }
@@ skipping 28 matching lines @@
   // We make this check for the case of minimized windows, unit tests, etc.
   if (platform_util::IsVisible(dom_ui_->tab_contents()->GetNativeView()) &&
       Animation::ShouldRenderRichAnimation()) {
 #if defined(OS_WIN)
     AppLaunchedAnimation::Show(extension, rect);
 #else
     NOTIMPLEMENTED();
 #endif
   }
 }