[Mac] Always launch in tab if bookmark apps are disabled.

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/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/host_desktop.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/extension.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
@@ skipping 21 matching lines @@
 }  // namespace launch_util
 
 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 only supported if bookmark apps are enabled.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+         switches::kDisableNewBookmarkApps) &&

[benwells, 2015/02/16 07:52:19]

Please use IsNewBookmarkAppsEnabled instead
(https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ext...).

[jackhou1, 2015/02/16 23:20:27]

Done.

+      !extension->is_platform_app() && result == LAUNCH_TYPE_WINDOW)
+    result = LAUNCH_TYPE_REGULAR;
+#endif
+
   return result;
 }
 
 LaunchType GetLaunchTypePrefValue(const ExtensionPrefs* prefs,
                                   const std::string& extension_id) {
   int value = LAUNCH_TYPE_INVALID;
   return prefs->ReadPrefAsInteger(extension_id, kPrefLaunchType, &value)
       ? static_cast<LaunchType>(value) : LAUNCH_TYPE_INVALID;
 }
 
@@ skipping 70 matching lines @@
 bool HasPreferredLaunchContainer(const ExtensionPrefs* prefs,
                                  const Extension* extension) {
   int value = -1;
   LaunchContainer manifest_launch_container =
       AppLaunchInfo::GetLaunchContainer(extension);
   return manifest_launch_container == LAUNCH_CONTAINER_TAB &&
       prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value);
 }
 
 }  // namespace extensions