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

BUG=59697
TEST=BrowserTest.OpenAppWindowLikeNtp,SessionRestoreUITest.RestoreAfterClosing*

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66646 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 3 deletions

diff --git a/chrome/browser/resources/new_new_tab.html b/chrome/browser/resources/new_new_tab.html
index 001c378..23ea917 100644
--- a/chrome/browser/resources/new_new_tab.html
+++ b/chrome/browser/resources/new_new_tab.html
@@ -236,6 +236,8 @@ if ('mode' in hashParams) {
     launch-type="0">
 <command id="apps-launch-type-regular" i18n-values=".label:applaunchtyperegular"
     launch-type="1">
+<command id="apps-launch-type-window"
+    i18n-values=".label:applaunchtypewindow" launch-type="3">
 <command id="apps-launch-type-fullscreen"
     i18n-values=".label:applaunchtypefullscreen" launch-type="2">
 
@@ -244,6 +246,8 @@ if ('mode' in hashParams) {
   <hr>
   <button command="#apps-launch-type-regular" launch-type="1"></button>
   <button command="#apps-launch-type-pinned" launch-type="0"></button>
+  <button id="apps-launch-type-window-menu-item"
+      command="#apps-launch-type-window" launch-type="3"></button>
   <button command="#apps-launch-type-fullscreen" launch-type="2"></button>
   <hr>
   <button command="#apps-options-command"></button>
diff --git a/chrome/browser/resources/ntp/apps.js b/chrome/browser/resources/ntp/apps.js
index 7069231..2e4a92c 100644
--- a/chrome/browser/resources/ntp/apps.js
+++ b/chrome/browser/resources/ntp/apps.js
@@ -21,6 +21,10 @@ function getAppsCallback(data) {
   var appsPromoPing = PING_WEBSTORE_LAUNCH_PREFIX + '+' + data.showPromo;
   var webStoreEntry;
 
+  // Hide the app window menu option on platforms that do not support it.
+  $('apps-launch-type-window-menu-item').style.display =
+      (data.disableAppWindowLaunch ? 'none' : 'inline');
+
   appsMiniview.textContent = '';
   appsSectionContent.textContent = '';
 
@@ -150,10 +154,11 @@ var apps = (function() {
   var LaunchType = {
     LAUNCH_PINNED: 0,
     LAUNCH_REGULAR: 1,
-    LAUNCH_FULLSCREEN: 2
+    LAUNCH_FULLSCREEN: 2,
+    LAUNCH_WINDOW: 3
   };
 
-  // Keep in sync with LaunchContainer in extension.h
+  // Keep in sync with LaunchContainer in extension_constants.h
   var LaunchContainer = {
     LAUNCH_WINDOW: 0,
     LAUNCH_PANEL: 1,
@@ -184,7 +189,8 @@ var apps = (function() {
         // Update the commands related to the launch type.
         var launchTypeIds = ['apps-launch-type-pinned',
                              'apps-launch-type-regular',
-                             'apps-launch-type-fullscreen'];
+                             'apps-launch-type-fullscreen',
+                             'apps-launch-type-window'];
         launchTypeIds.forEach(function(id) {
           var command = $(id);
           command.disabled = isPanel;
@@ -215,6 +221,7 @@ var apps = (function() {
       case 'apps-launch-type-pinned':
       case 'apps-launch-type-regular':
       case 'apps-launch-type-fullscreen':
+      case 'apps-launch-type-window':
         chrome.send('setLaunchType',
             [currentApp['id'], e.command.getAttribute('launch-type')]);
         break;