Add "create Application Shortcut" to the app menu on NTP.

chrome/browser/extensions/extension_prefs.cc

 // Copyright (c) 2010 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/extension_prefs.h"
 
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 546 matching lines @@
 }
 
 void ExtensionPrefs::SetAllowFileAccess(const std::string& extension_id,
                                         bool allow) {
   UpdateExtensionPref(extension_id, kPrefAllowFileAccess,
                       Value::CreateBooleanValue(allow));
   SavePrefsAndNotify();
 }
 
 ExtensionPrefs::LaunchType ExtensionPrefs::GetLaunchType(
-    const std::string& extension_id) {
+    const std::string& extension_id,
+    ExtensionPrefs::LaunchType default_pref_value) {
   int value;
+  LaunchType result;

[Aaron Boodman, 2010/11/30 00:29:28]

Nit: Always initialize primitives.

[Sam Kerner (Chrome), 2010/11/30 01:21:04]

Done.

+
   if (ReadExtensionPrefInteger(extension_id, kPrefLaunchType, &value) &&
      (value == LAUNCH_PINNED ||
       value == LAUNCH_REGULAR ||
       value == LAUNCH_FULLSCREEN ||
       value == LAUNCH_WINDOW)) {
-
-#if defined(OS_MACOSX)
+    result = static_cast<LaunchType>(value);
+  } else {
+    result = default_pref_value;
+  }
+  #if defined(OS_MACOSX)
     // App windows are not yet supported on mac.  Pref sync could make
     // the launch type LAUNCH_WINDOW, even if there is no UI to set it
     // on mac.
-    if (value == LAUNCH_WINDOW)
-      return LAUNCH_REGULAR;
-#endif
-    return static_cast<LaunchType>(value);
-  }
+    if (result == LAUNCH_WINDOW)
+      result = LAUNCH_REGULAR;
+  #endif
 
-  return LAUNCH_REGULAR;
+  return result;
+}
+
+extension_misc::LaunchContainer ExtensionPrefs::GetLaunchContainer(
+    const Extension* extension,
+    ExtensionPrefs::LaunchType default_pref_value) {
+  extension_misc::LaunchContainer launch_container =
+      extension->launch_container();
+
+  ExtensionPrefs::LaunchType prefs_launch_type =
+      GetLaunchType(extension->id(), default_pref_value);
+
+  // If the user chose to open in a window, then launch in one.
+  if (prefs_launch_type == ExtensionPrefs::LAUNCH_WINDOW)
+    return extension_misc::LAUNCH_WINDOW;
+
+  // Otherwise, use the container the extension chose.
+  return launch_container;
 }
 
 void ExtensionPrefs::SetLaunchType(const std::string& extension_id,
                                    LaunchType launch_type) {
   UpdateExtensionPref(extension_id, kPrefLaunchType,
       Value::CreateIntegerValue(static_cast<int>(launch_type)));
   SavePrefsAndNotify();
 }
 
 void ExtensionPrefs::GetKilledExtensionIds(std::set<std::string>* killed_ids) {
@@ skipping 476 matching lines @@
 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionsPref);
   prefs->RegisterListPref(kExtensionToolbar);
   prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize, -1);
   prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate);
   prefs->RegisterListPref(prefs::kExtensionInstallAllowList);
   prefs->RegisterListPref(prefs::kExtensionInstallDenyList);
   prefs->RegisterListPref(prefs::kExtensionInstallForceList);
   prefs->RegisterStringPref(kWebStoreLogin, std::string() /* default_value */);
 }