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. CanHostedAppsOpenInWindows() is false
+  if (!extension->is_platform_app() && result == LAUNCH_TYPE_WINDOW &&
+      !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