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

chrome/browser/ui/app_list/app_context_menu.cc

Index: chrome/browser/ui/app_list/app_context_menu.cc
diff --git a/chrome/browser/ui/app_list/app_context_menu.cc b/chrome/browser/ui/app_list/app_context_menu.cc
index bb955c1f3bfe9aaa14c710a28ff9f1094febd3ea..413600afd594e851f11539f6e83fbf40a30ea93e 100644
--- a/chrome/browser/ui/app_list/app_context_menu.cc
+++ b/chrome/browser/ui/app_list/app_context_menu.cc
@@ -115,11 +115,9 @@ ui::MenuModel* AppContextMenu::GetMenuModel() {
     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,