Moved IS_EPHEMERAL flag to extension prefs

chrome/browser/extensions/api/management/management_api.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/extensions/api/management/management_api.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/management/management_api_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/api/management.h"
@@ skipping 173 matching lines @@
     case Manifest::EXTERNAL_COMPONENT:
       info->install_type = management::ExtensionInfo::INSTALL_TYPE_OTHER;
       break;
   }
 
   return info.Pass();
 }
 
 void AddExtensionInfo(const ExtensionSet& extensions,
                             ExtensionSystem* system,
-                            ExtensionInfoList* extension_list) {
+                            ExtensionInfoList* extension_list,
+                            content::BrowserContext* context) {
   for (ExtensionSet::const_iterator iter = extensions.begin();
        iter != extensions.end(); ++iter) {
     const Extension& extension = *iter->get();
 
-    if (extension.ShouldNotBeVisible())
+    if (ui_util::ShouldNotBeVisible(&extension, context))
       continue;  // Skip built-in extensions/apps.
 
     extension_list->push_back(make_linked_ptr<management::ExtensionInfo>(
         CreateExtensionInfo(extension, system).release()));
   }
 }
 
 } // namespace
 
 ExtensionService* ManagementFunction::service() {
   return GetProfile()->GetExtensionService();
 }
 
 ExtensionService* AsyncManagementFunction::service() {
   return GetProfile()->GetExtensionService();
 }
 
 bool ManagementGetAllFunction::RunSync() {
   ExtensionInfoList extensions;
   ExtensionRegistry* registry = ExtensionRegistry::Get(GetProfile());
   ExtensionSystem* system = ExtensionSystem::Get(GetProfile());
 
-  AddExtensionInfo(registry->enabled_extensions(), system, &extensions);
-  AddExtensionInfo(registry->disabled_extensions(), system, &extensions);
-  AddExtensionInfo(registry->terminated_extensions(), system, &extensions);
+  AddExtensionInfo(registry->enabled_extensions(),
+                   system, &extensions, browser_context());
+  AddExtensionInfo(registry->disabled_extensions(),
+                   system, &extensions, browser_context());
+  AddExtensionInfo(registry->terminated_extensions(),
+                   system, &extensions, browser_context());
 
   results_ = management::GetAll::Results::Create(extensions);
   return true;
 }
 
 bool ManagementGetFunction::RunSync() {
   scoped_ptr<management::Get::Params> params(
       management::Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ skipping 202 matching lines @@
 }
 
 bool ManagementSetEnabledFunction::RunAsync() {
   scoped_ptr<management::SetEnabled::Params> params(
       management::SetEnabled::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   extension_id_ = params->id;
 
   const Extension* extension = service()->GetInstalledExtension(extension_id_);
-  if (!extension || extension->ShouldNotBeVisible()) {
+  if (!extension || ui_util::ShouldNotBeVisible(extension, browser_context())) {
     error_ = ErrorUtils::FormatErrorMessage(
         keys::kNoExtensionError, extension_id_);
     return false;
   }
 
   const ManagementPolicy* policy =
       ExtensionSystem::Get(GetProfile())->management_policy();
   if (!policy->UserMayModifySettings(extension, NULL) ||
       (!params->enabled && policy->MustRemainEnabled(extension, NULL)) ||
       (params->enabled && policy->MustRemainDisabled(extension, NULL, NULL))) {
@@ skipping 47 matching lines @@
 
 ManagementUninstallFunctionBase::~ManagementUninstallFunctionBase() {
 }
 
 bool ManagementUninstallFunctionBase::Uninstall(
     const std::string& target_extension_id,
     bool show_confirm_dialog) {
   extension_id_ = target_extension_id;
   const Extension* target_extension =
       service()->GetExtensionById(extension_id_, true);
-  if (!target_extension || target_extension->ShouldNotBeVisible()) {
+  if (!target_extension ||
+      ui_util::ShouldNotBeVisible(target_extension, browser_context())) {
     error_ = ErrorUtils::FormatErrorMessage(
         keys::kNoExtensionError, extension_id_);
     return false;
   }
 
   if (!ExtensionSystem::Get(GetProfile())
            ->management_policy()
            ->UserMayModifySettings(target_extension, NULL)) {
     error_ = ErrorUtils::FormatErrorMessage(
         keys::kUserCantModifyError, extension_id_);
@@ skipping 216 matching lines @@
       extension =
           content::Details<const UnloadedExtensionInfo>(details)->extension;
       break;
     default:
       NOTREACHED();
       return;
   }
   DCHECK(event_name);
   DCHECK(extension);
 
-  if (extension->ShouldNotBeVisible())
+  if (ui_util::ShouldNotBeVisible(extension, profile_))
     return; // Don't dispatch events for built-in extensions.
 
   scoped_ptr<base::ListValue> args(new base::ListValue());
   if (event_name == management::OnUninstalled::kEventName) {
     args->Append(new base::StringValue(extension->id()));
   } else {
     scoped_ptr<management::ExtensionInfo> info = CreateExtensionInfo(
         *extension, ExtensionSystem::Get(profile));
     args->Append(info->ToValue().release());
   }
@@ skipping 27 matching lines @@
   return g_factory.Pointer();
 }
 
 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
   management_event_router_.reset(
       new ManagementEventRouter(Profile::FromBrowserContext(browser_context_)));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 }  // namespace extensions