Revert 66646 - Add "open as window" menu item to NTP app menu....

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 434 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) {
   int value;
-  if (ReadExtensionPrefInteger(extension_id, kPrefLaunchType, &value) &&
-     (value == LAUNCH_PINNED ||
+  if (ReadExtensionPrefInteger(extension_id, kPrefLaunchType, &value) && (
+      value == LAUNCH_PINNED ||
       value == LAUNCH_REGULAR ||
-      value == LAUNCH_FULLSCREEN ||
-      value == LAUNCH_WINDOW)) {
-
-#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
+      value == LAUNCH_FULLSCREEN)) {
     return static_cast<LaunchType>(value);
   }
-
   return LAUNCH_REGULAR;
 }
 
 void ExtensionPrefs::SetLaunchType(const std::string& extension_id,
                                    LaunchType launch_type) {
   UpdateExtensionPref(extension_id, kPrefLaunchType,
       Value::CreateIntegerValue(static_cast<int>(launch_type)));
   SavePrefsAndNotify();
 }
 
@@ skipping 453 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 */);
 }