Make the Chrome Web Store Icon Syncable

chrome/browser/ui/webui/ntp/app_launcher_handler.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/browser/ui/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 79 matching lines @@
   DictionaryValue* dictionary = new DictionaryValue();
   dictionary->SetString("title", notification.title());
   dictionary->SetString("body", notification.body());
   if (!notification.link_url().is_empty()) {
     dictionary->SetString("linkUrl", notification.link_url().spec());
     dictionary->SetString("linkText", notification.link_text());
   }
   return dictionary;
 }
 
-// static
-bool AppLauncherHandler::IsAppExcludedFromList(const Extension* extension) {
-  // The Cloud Print app should never be displayed in the NTP.
-  if (!extension->is_app() ||
-      (extension->id() == extension_misc::kCloudPrintAppId)) {
-    return true;
-  }
-  return false;
-}
-
 void AppLauncherHandler::CreateAppInfo(const Extension* extension,
                                        const AppNotification* notification,
                                        ExtensionService* service,
                                        DictionaryValue* value) {
   bool enabled = service->IsExtensionEnabled(extension->id()) &&
       !service->GetTerminatedExtension(extension->id());
   bool icon_big_exists = true;
   // Instead of setting grayscale here, we do it in apps_page.js.
   GURL icon_big =
       ExtensionIconSource::GetIconURL(extension,
@@ skipping 224 matching lines @@
 
 void AppLauncherHandler::FillAppDictionary(DictionaryValue* dictionary) {
   // CreateAppInfo and ClearOrdinals can change the extension prefs.
   AutoReset<bool> auto_reset(&ignore_changes_, true);
 
   ListValue* list = new ListValue();
   const ExtensionSet* extensions = extension_service_->extensions();
   ExtensionSet::const_iterator it;
   for (it = extensions->begin(); it != extensions->end(); ++it) {
     const Extension* extension = *it;
-    if (!IsAppExcludedFromList(extension)) {
+    if (extension->ShouldDisplayInLauncher()) {
       DictionaryValue* app_info = GetAppInfo(extension);
       list->Append(app_info);
     } else {
       // This is necessary because in some previous versions of chrome, we set a
       // page index for non-app extensions. Old profiles can persist this error,
       // and this fixes it. This caused GetNaturalAppPageIndex() to break
       // (see http://crbug.com/98325) before it was an ordinal value.
       ExtensionSorting* sortings =
           extension_service_->extension_prefs()->extension_sorting();
       if (sortings->GetPageOrdinal(extension->id()).IsValid())
         sortings->ClearOrdinals(extension->id());
     }
   }
 
   extensions = extension_service_->disabled_extensions();
   for (it = extensions->begin(); it != extensions->end(); ++it) {
-    if (!IsAppExcludedFromList(*it)) {
+    if ((*it)->ShouldDisplayInLauncher()) {
       DictionaryValue* app_info = new DictionaryValue();
       CreateAppInfo(*it,
                     NULL,
                     extension_service_,
                     app_info);
       list->Append(app_info);
     }
   }
 
   extensions = extension_service_->terminated_extensions();
   for (it = extensions->begin(); it != extensions->end(); ++it) {
-    if (!IsAppExcludedFromList(*it)) {
+    if ((*it)->ShouldDisplayInLauncher()) {
       DictionaryValue* app_info = new DictionaryValue();
       CreateAppInfo(*it,
                     NULL,
                     extension_service_,
                     app_info);
       list->Append(app_info);
     }
   }
 
   dictionary->Set("apps", list);
@@ skipping 600 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extension_service_->apps_promo();
   const ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extension_service_->GetExtensionById(*iter, true))
       extension_service_->UninstallExtension(*iter, false, NULL);
   }
 }