Make the NTP apps page respect the enable hosted apps in windows flag.

chrome/browser/resources/ntp4/apps_page.js

 // Copyright (c) 2012 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.
 
 cr.define('ntp', function() {
   'use strict';
 
   var APP_LAUNCH = {
     // The histogram buckets (keep in sync with extension_constants.h).
     NTP_APPS_MAXIMIZED: 0,
@@ skipping 32 matching lines @@
       cr.ui.decorate(menu, cr.ui.Menu);
       menu.classList.add('app-context-menu');
       this.menu = menu;
 
       this.launch_ = this.appendMenuItem_();
       this.launch_.addEventListener('activate', this.onLaunch_.bind(this));
 
       menu.appendChild(cr.ui.MenuItem.createSeparator());
       this.launchRegularTab_ = this.appendMenuItem_('applaunchtyperegular');
       this.launchPinnedTab_ = this.appendMenuItem_('applaunchtypepinned');
-      if (loadTimeData.getBoolean('enableNewBookmarkApps') || !cr.isMac)
+      if (loadTimeData.getBoolean('hostedAppsInWindowsEnabled'))
         this.launchNewWindow_ = this.appendMenuItem_('applaunchtypewindow');
       this.launchFullscreen_ = this.appendMenuItem_('applaunchtypefullscreen');
 
       var self = this;
       this.forAllLaunchTypes_(function(launchTypeButton, id) {
         launchTypeButton.addEventListener('activate',
             self.onLaunchTypeChanged_.bind(self));
       });
 
       this.launchTypeMenuSeparator_ = cr.ui.MenuItem.createSeparator();
@@ skipping 65 matching lines @@
     /**
      * Does all the necessary setup to show the menu for the given app.
      * @param {App} app The App object that will be showing a context menu.
      */
     setupForApp: function(app) {
       this.app_ = app;
 
       this.launch_.textContent = app.appData.title;
 
       var launchTypeWindow = this.launchNewWindow_;
+      var hasLaunchType = false;
       this.forAllLaunchTypes_(function(launchTypeButton, id) {
         launchTypeButton.disabled = false;
         launchTypeButton.checked = app.appData.launch_type == id;
-        // If bookmark apps are enabled, only show the "Open as window" button.
+        // There are three cases when a launch type is hidden:
+        //  1. packaged apps hide all launch types
+        //  2. hostedAppsInWindowsEnabled is false and type is launchTypeWindow
+        //  3. enableNewBookmarkApps is true and type is anything except
+        //     launchTypeWindow
         launchTypeButton.hidden = app.appData.packagedApp ||
+            (!loadTimeData.getBoolean('hostedAppsInWindowsEnabled') &&
+             launchTypeButton == launchTypeWindow) ||
             (loadTimeData.getBoolean('enableNewBookmarkApps') &&
              launchTypeButton != launchTypeWindow);
+        hasLaunchType = hasLaunchType || !launchTypeButton.hidden;

[Dan Beam, 2015/08/20 18:25:57]

if (!launchTypeButton.hidden) hasLaunchType = true;

[dominickn, 2015/08/20 22:07:44]

Done.

       });
 
-      this.launchTypeMenuSeparator_.hidden = app.appData.packagedApp;
+      this.launchTypeMenuSeparator_.hidden =
+          app.appData.packagedApp || !hasLaunchType;
 
       this.options_.disabled = !app.appData.optionsUrl || !app.appData.enabled;
       if (this.details_)
         this.details_.disabled = !app.appData.detailsUrl;
       this.uninstall_.disabled = !app.appData.mayDisable;
 
       if (cr.isMac) {
         // On Windows and Linux, these should always be visible. On ChromeOS,
         // they are never created. On Mac, shortcuts can only be created for
         // new-style packaged apps, so hide the menu item.
@@ skipping 619 matching lines @@
   function launchAppAfterEnable(appId) {
     chrome.send('launchApp', [appId, APP_LAUNCH.NTP_APP_RE_ENABLE]);
   }
 
   return {
     APP_LAUNCH: APP_LAUNCH,
     AppsPage: AppsPage,
     launchAppAfterEnable: launchAppAfterEnable,
   };
 });