From cdc0ecebd435e51ccfec5f4e6f208570f5703bdf Mon Sep 17 00:00:00 2001
From: "scherkus@chromium.org"
 <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 17 Jun 2010 02:09:40 +0000
Subject: Make apps launch using their default container as specified in their
 manifest.

The debug options were forcefully causing apps to launch as tabs.

BUG=46502
TEST=try launching a panel or window based app, it shouldn't launch as a tab

Review URL: http://codereview.chromium.org/2844008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50070 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/dom_ui/app_launcher_handler.cc | 2 +-
 chrome/browser/resources/new_new_tab.html     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'chrome')

diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
index b34c82d..5fe6ba5 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/dom_ui/app_launcher_handler.cc
@@ -178,7 +178,7 @@ void AppLauncherHandler::HandleLaunchApp(const Value* value) {
     return;
   }
 
-  Extension::LaunchContainer container = Extension::LAUNCH_TAB;
+  Extension::LaunchContainer container = extension->launch_container();
   if (launch_container == "tab")
     container = Extension::LAUNCH_TAB;
   else if (launch_container == "panel")
diff --git a/chrome/browser/resources/new_new_tab.html b/chrome/browser/resources/new_new_tab.html
index b29a3fa..8a6339f 100644
--- a/chrome/browser/resources/new_new_tab.html
+++ b/chrome/browser/resources/new_new_tab.html
@@ -169,8 +169,10 @@ if ('mode' in hashParams) {
       <h2>Debug</h2>
       <div id="apps-launch-control">
         Open apps in:<label
+        ><input type="radio" name="launch-container-type" value=""
+            checked="true">Default</label
         ><input type="radio" name="launch-container-type" value="tab"
-            checked="true">Default (Tab)</label
+            >Tab</label
         ><label><input type="radio" name="launch-container-type" value="window"
             >Window</label
         ><label><input type="radio" name="launch-container-type" value="panel"
-- 
cgit v1.1