Add a flag to enable open in window for hosted apps on Mac.

chrome/browser/ui/app_list/app_context_menu.cc

 // Copyright 2013 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/ui/app_list/app_context_menu.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/menu_manager.h"
@@ skipping 97 matching lines @@
               IDS_APP_LIST_CONTEXT_MENU_PIN);
     }
 
     if (controller_->CanDoCreateShortcutsFlow()) {
       menu_model_->AddItemWithStringId(CREATE_SHORTCUTS,
                                        IDS_NEW_TAB_APP_CREATE_SHORTCUT);
     }
     menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
 
     if (!is_platform_app_) {
-      // When bookmark apps are enabled, hosted apps can only toggle between
-      // USE_LAUNCH_TYPE_WINDOW and USE_LAUNCH_TYPE_REGULAR.
-      if (extensions::util::IsNewBookmarkAppsEnabled()) {
-        menu_model_->AddCheckItemWithStringId(USE_LAUNCH_TYPE_WINDOW,
-                                              IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
+      if (extensions::util::CanHostedAppsOpenInWindows()) {

[benwells, 2015/08/19 05:44:54]

This logic looks nice and simple now, but I think it isn't quite what we want.
This is what i was worrying about with the complexity of keeping these two
things orthogonal ...

The complexity is because bookmark apps does some extra crazy stuff with
removing the pinned and fullscreen options, and we should keep that as it has
rolled out to stable already.

Thinking about the cases we have:

Bookmark apps enabled / hosted apps in windows enabled:
-> just want to add the extra 'window' as per line 120 of the new code

Bookmark apps enabled / hosted apps in windows disabled:
-> want to do nothing here

Bookmark apps disabled / hosted apps in windows enabled:
-> want to do what the 'else' statement here is doing, with the '#if defined
MAC' deleted

Bookmark apps disabled / hosted apps in windows disabled:
-> want to do what the else statement here is doing, with the '#if defined MAC'
statement kept (i.e. what is in that statement'.

Does that make sense?

[dominickn, 2015/08/19 06:29:04]

Done.

+        menu_model_->AddCheckItemWithStringId(
+            USE_LAUNCH_TYPE_WINDOW, IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
       } else {
         menu_model_->AddCheckItemWithStringId(
             USE_LAUNCH_TYPE_REGULAR,
             IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
         menu_model_->AddCheckItemWithStringId(
             USE_LAUNCH_TYPE_PINNED,
             IDS_APP_CONTEXT_MENU_OPEN_PINNED);
 #if defined(OS_MACOSX)
         // Mac does not support standalone web app browser windows or maximize.
         menu_model_->AddCheckItemWithStringId(
@@ skipping 155 matching lines @@
     extension_menu_items_->ExecuteCommand(command_id, NULL,
                                           content::ContextMenuParams());
   } else if (command_id == MENU_NEW_WINDOW) {
     controller_->CreateNewWindow(profile_, false);
   } else if (command_id == MENU_NEW_INCOGNITO_WINDOW) {
     controller_->CreateNewWindow(profile_, true);
   }
 }
 
 }  // namespace app_list