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

chrome/browser/extensions/launch_util.cc

 // Copyright (c) 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/extensions/launch_util.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 31 matching lines @@
 
 LaunchType GetLaunchType(const ExtensionPrefs* prefs,
                          const Extension* extension) {
   LaunchType result = LAUNCH_TYPE_DEFAULT;
 
   int value = GetLaunchTypePrefValue(prefs, extension->id());
   if (value >= LAUNCH_TYPE_FIRST && value < NUM_LAUNCH_TYPES)
     result = static_cast<LaunchType>(value);
 
 #if defined(OS_MACOSX)
-  // On Mac, opening in a window is currently disabled for non platform apps.
-  if (!extension->is_platform_app() && result == LAUNCH_TYPE_WINDOW)
+  // Disable opening as window on Mac if:
+  //  1. the extension isn't a platform app, AND
+  //  2. the intended result is open as window, AND
+  //  3. one of IsNewBookmarkAppsEnabled() or CanHostedAppsOpenInWindows() are

[benwells, 2015/08/19 02:39:21]

Why does this depend on IsNewBookmarkAppsEnabled at all?

[dominickn, 2015/08/19 03:01:13]

I kept it like this because the new bookmark apps are disabled by default on
Mac. The intention is to remove the IsNewBookmarkAppsEnabled dependency once the
flag is flipped. Should I just remove it now?

[benwells, 2015/08/19 03:26:52]

I'm not sure, but it shouldn't depend on the current default state of flags.

Ideally the two flags should be orthogonal - i.e. whether hosted apps (which is
a superset of bookmark apps) can run in windows, and whether users can create
bookmark apps, feel like independent things. It seems reasonable to be able to
run hosted apps in windows while not having bookmark apps enabled.

So ideally I think they would be independent. However I'm not sure what that
means in the code. If it turns out to be complicated we could make the ability
to run hosted apps in windows only valid if the new bookmarks flow is enabled.

[dominickn, 2015/08/19 05:21:58]

Done.

+  //     false
+  if (!extension->is_platform_app() && result == LAUNCH_TYPE_WINDOW &&
+      (!extensions::util::IsNewBookmarkAppsEnabled() ||
+       !extensions::util::CanHostedAppsOpenInWindows())) {
     result = LAUNCH_TYPE_REGULAR;
+  }
 #else
   if (extensions::util::IsNewBookmarkAppsEnabled()) {
     if (result == LAUNCH_TYPE_PINNED)
       result = LAUNCH_TYPE_REGULAR;
     if (result == LAUNCH_TYPE_FULLSCREEN)
       result = LAUNCH_TYPE_WINDOW;
   }
 #endif
 
   return result;
@@ skipping 85 matching lines @@
       prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value);
 }
 
 bool LaunchesInWindow(content::BrowserContext* context,
                       const Extension* extension) {
   return GetLaunchType(ExtensionPrefs::Get(context), extension) ==
          LAUNCH_TYPE_WINDOW;
 }
 
 }  // namespace extensions