Make Extension::ShouldDisplayInLauncher driven by manifest property.

chrome/common/extensions/extension.cc

 // Copyright (c) 2012 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/common/extensions/extension.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1032 matching lines @@
   return true;
 }
 
 bool Extension::LoadAppFeatures(string16* error) {
   if (!LoadExtent(keys::kWebURLs, &extent_,
                   errors::kInvalidWebURLs, errors::kInvalidWebURL, error) ||
       !LoadLaunchURL(error) ||
       !LoadLaunchContainer(error)) {
     return false;
   }
-
+  if (manifest_->HasKey(keys::kDisplayInLauncher) &&
+      !manifest_->GetBoolean(keys::kDisplayInLauncher, &display_in_launcher_)) {
+    *error = ASCIIToUTF16(errors::kInvalidDisplayInLauncher);
+    return false;
+  }
   return true;
 }
 
 bool Extension::LoadOAuth2Info(string16* error) {
   if (!manifest_->HasKey(keys::kOAuth2))
     return true;
 
   if (!manifest_->GetString(keys::kOAuth2ClientId, &oauth2_info_.client_id) ||
       oauth2_info_.client_id.empty()) {
     *error = ASCIIToUTF16(errors::kInvalidOAuth2ClientId);
@@ skipping 1878 matching lines @@
       incognito_split_mode_(false),
       offline_enabled_(false),
       converted_from_user_script_(false),
       background_page_is_persistent_(true),
       allow_background_js_access_(true),
       manifest_(manifest.release()),
       is_storage_isolated_(false),
       launch_container_(extension_misc::LAUNCH_TAB),
       launch_width_(0),
       launch_height_(0),
+      display_in_launcher_(true),
       wants_file_access_(false),
       creation_flags_(0) {
   DCHECK(path.empty() || path.IsAbsolute());
   path_ = MaybeNormalizePath(path);
 }
 
 Extension::~Extension() {
 }
 
 ExtensionResource Extension::GetResource(
@@ skipping 842 matching lines @@
   // apps, creates a new profile (which get default apps) and then enables sync
   // for it, then their profile everywhere gets the default apps.
   bool is_syncable = (location() == Extension::INTERNAL &&
       !was_installed_by_default());
   // Sync the chrome web store to maintain its position on the new tab page.
   is_syncable |= (id() ==  extension_misc::kWebStoreAppId);
   return is_syncable;
 }
 
 bool Extension::ShouldDisplayInLauncher() const {
-  // All apps should be displayed on the NTP except for the Cloud Print App.
-  bool should_display_in_launcher = is_app() &&
-                                    id() != extension_misc::kCloudPrintAppId;
-#if defined(OS_CHROMEOS)
-  // Wallpaper manager is a component app which can only be launched via context
-  // menu or set wallpaper button in chrome settings page. We want to hide it
-  // from launcher.
-  return should_display_in_launcher &&
-      id() != extension_misc::kWallpaperManagerId;
-#else
-  return should_display_in_launcher;
-#endif
+  // Only apps should be displayed on the NTP.
+  return is_app() && display_in_launcher_;
 }
 
 bool Extension::InstallWarning::operator==(const InstallWarning& other) const {
   return format == other.format && message == other.message;
 }
 
 void PrintTo(const Extension::InstallWarning& warning, ::std::ostream* os) {
   *os << "InstallWarning(";
   switch (warning.format) {
     case Extension::InstallWarning::FORMAT_TEXT:
@@ skipping 185 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions