Moved IS_EPHEMERAL flag to extension prefs

chrome/browser/ui/app_list/extension_app_model_builder.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/app_list/extension_app_model_builder.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "ui/gfx/image/image_skia.h"
 
 using extensions::Extension;
 
-namespace {
-
-bool ShouldDisplayInAppLauncher(Profile* profile,
-                                scoped_refptr<const Extension> app) {
-  // If it's the web store, check the policy.
-  bool blocked_by_policy =
-      (app->id() == extension_misc::kWebStoreAppId ||
-       app->id() == extension_misc::kEnterpriseWebStoreAppId) &&
-      profile->GetPrefs()->GetBoolean(prefs::kHideWebStoreIcon);
-  return app->ShouldDisplayInAppLauncher() && !blocked_by_policy;
-}
-
-}  // namespace
-
 ExtensionAppModelBuilder::ExtensionAppModelBuilder(
     AppListControllerDelegate* controller)
     : service_(NULL),
       profile_(NULL),
       controller_(controller),
       model_(NULL),
       highlighted_app_pending_(false),
       tracker_(NULL) {
 }
 
@@ skipping 74 matching lines @@
     return;
   item->SetPercentDownloaded(percent_downloaded);
 }
 
 void ExtensionAppModelBuilder::OnInstallFailure(
     const std::string& extension_id) {
   model_->DeleteItem(extension_id);
 }
 
 void ExtensionAppModelBuilder::OnExtensionLoaded(const Extension* extension) {
-  if (!extension->ShouldDisplayInAppLauncher())
+  if (!extensions::ui_util::ShouldDisplayInAppLauncher(extension, profile_))
     return;
 
   DVLOG(2) << service_ << ": OnExtensionLoaded: "
            << extension->id().substr(0, 8);
   ExtensionAppItem* existing_item = GetExtensionAppItem(extension->id());
   if (existing_item) {
     existing_item->Reload();
     if (service_)
       service_->UpdateItem(existing_item);
     return;
@@ skipping 19 matching lines @@
     DVLOG(2) << service_ << ": OnExtensionUninstalled: "
              << extension->id().substr(0, 8);
     service_->RemoveItem(extension->id());
     return;
   }
   model_->DeleteItem(extension->id());
 }
 
 void ExtensionAppModelBuilder::OnDisabledExtensionUpdated(
     const Extension* extension) {
-  if (!extension->ShouldDisplayInAppLauncher())
+  if (!extensions::ui_util::ShouldDisplayInAppLauncher(extension, profile_))
     return;
 
   ExtensionAppItem* existing_item = GetExtensionAppItem(extension->id());
   if (existing_item)
     existing_item->Reload();
 }
 
 void ExtensionAppModelBuilder::OnAppInstalledToAppList(
     const std::string& extension_id) {
   SetHighlightedApp(extension_id);
@@ skipping 32 matching lines @@
   if (tracker_)
     tracker_->AddObserver(this);
 }
 
 void ExtensionAppModelBuilder::PopulateApps() {
   extensions::ExtensionSet extensions;
   controller_->GetApps(profile_, &extensions);
 
   for (extensions::ExtensionSet::const_iterator app = extensions.begin();
        app != extensions.end(); ++app) {
-    if (!ShouldDisplayInAppLauncher(profile_, *app))
+    if (!extensions::ui_util::ShouldDisplayInAppLauncher(*app, profile_))
       continue;
     InsertApp(CreateAppItem((*app)->id(),
                             "",
                             gfx::ImageSkia(),
                             (*app)->is_platform_app()));
   }
 }
 
 void ExtensionAppModelBuilder::InsertApp(scoped_ptr<ExtensionAppItem> app) {
   if (service_) {
@@ skipping 62 matching lines @@
     app_list::AppListItem* item = item_list->item_at(idx + 1);
     if (item->GetItemType() == ExtensionAppItem::kItemType) {
       next = static_cast<ExtensionAppItem*>(item);
       break;
     }
   }
   // item->Move will call set_position, overriding the item's position.
   if (prev || next)
     static_cast<ExtensionAppItem*>(item)->Move(prev, next);
 }