#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
+#include "chrome/browser/content_settings/content_settings_custom_extension_provider.h"
+#include "chrome/browser/content_settings/content_settings_internal_extension_provider.h"
+#include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/browser/extensions/api/content_settings/content_settings_service.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/data_deleter.h"
+#include "chrome/browser/extensions/extension_action_storage_manager.h"
#include "chrome/browser/extensions/extension_assets_manager.h"
#include "chrome/browser/extensions/extension_disabled_ui.h"
#include "chrome/browser/extensions/extension_error_controller.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "chrome/browser/extensions/shared_module_service.h"
#include "chrome/browser/extensions/unpacked_installer.h"
+#include "chrome/browser/extensions/updater/chrome_extension_downloader_factory.h"
#include "chrome/browser/extensions/updater/extension_cache.h"
#include "chrome/browser/extensions/updater/extension_downloader.h"
#include "chrome/browser/extensions/updater/extension_updater.h"
+#include "chrome/browser/google/google_brand.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/profile_identity_provider.h"
-#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#include "chrome/browser/ui/webui/favicon_source.h"
#include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
-#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
#include "chrome/browser/ui/webui/theme_source.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/crash_keys.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/features/feature_channel.h"
#include "chrome/common/extensions/manifest_url_handler.h"
-#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
-#include "components/signin/core/browser/signin_manager.h"
+#include "components/crx_file/id_util.h"
#include "components/startup_metric_utils/startup_metric_utils.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/notification_service.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/install_flag.h"
-#include "extensions/browser/pref_names.h"
#include "extensions/browser/runtime_data.h"
#include "extensions/browser/uninstall_reason.h"
#include "extensions/browser/update_observer.h"
#include "extensions/common/extension_messages.h"
+#include "extensions/common/extension_urls.h"
#include "extensions/common/feature_switch.h"
#include "extensions/common/file_util.h"
#include "extensions/common/manifest_constants.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/extensions/install_limiter.h"
-#include "webkit/browser/fileapi/file_system_backend.h"
-#include "webkit/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_backend.h"
+#include "storage/browser/fileapi/file_system_context.h"
#endif
using content::BrowserContext;
using content::DevToolsAgentHost;
using extensions::CrxInstaller;
using extensions::Extension;
-using extensions::ExtensionDownloader;
-using extensions::ExtensionDownloaderDelegate;
using extensions::ExtensionIdSet;
using extensions::ExtensionInfo;
using extensions::ExtensionRegistry;
// Wait this many seconds after an extensions becomes idle before updating it.
const int kUpdateIdleDelay = 5;
-#if defined(ENABLE_EXTENSIONS)
-scoped_ptr<IdentityProvider> CreateWebstoreIdentityProvider(Profile* profile) {
- return make_scoped_ptr<IdentityProvider>(new ProfileIdentityProvider(
- SigninManagerFactory::GetForProfile(profile),
- ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
- LoginUIServiceFactory::GetForProfile(profile)));
-}
-#endif // defined(ENABLE_EXTENSIONS)
-
} // namespace
// ExtensionService.
}
void ExtensionService::SetFileTaskRunnerForTesting(
- base::SequencedTaskRunner* task_runner) {
+ const scoped_refptr<base::SequencedTaskRunner>& task_runner) {
file_task_runner_ = task_runner;
}
int creation_flags,
bool mark_acknowledged) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- CHECK(Extension::IdIsValid(id));
+ CHECK(crx_file::id_util::IdIsValid(id));
if (Manifest::IsExternalLocation(location)) {
// All extensions that are not user specific can be cached.
registrar_.Add(this,
chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED,
content::Source<Profile>(profile_));
- pref_change_registrar_.Init(profile->GetPrefs());
- base::Closure callback =
- base::Bind(&ExtensionService::OnExtensionInstallPrefChanged,
- base::Unretained(this));
- pref_change_registrar_.Add(extensions::pref_names::kInstallAllowList,
- callback);
- pref_change_registrar_.Add(extensions::pref_names::kInstallDenyList,
- callback);
- pref_change_registrar_.Add(extensions::pref_names::kAllowedTypes, callback);
+
+ extensions::ExtensionManagementFactory::GetForBrowserContext(profile_)
+ ->AddObserver(this);
// Set up the ExtensionUpdater
if (autoupdate_enabled) {
profile,
update_frequency,
extensions::ExtensionCache::GetInstance(),
- base::Bind(&ExtensionService::CreateExtensionDownloader,
- base::Unretained(this))));
+ base::Bind(ChromeExtensionDownloaderFactory::CreateForProfile,
+ profile)));
}
component_loader_.reset(
}
void ExtensionService::Shutdown() {
+ extensions::ExtensionManagementFactory::GetInstance()
+ ->GetForBrowserContext(profile())
+ ->RemoveObserver(this);
system_->management_policy()->UnregisterProvider(
shared_module_policy_provider_.get());
}
return true;
}
-scoped_ptr<ExtensionDownloader> ExtensionService::CreateExtensionDownloader(
- ExtensionDownloaderDelegate* delegate) {
- scoped_ptr<ExtensionDownloader> downloader;
-#if defined(ENABLE_EXTENSIONS)
- scoped_ptr<IdentityProvider> identity_provider =
- CreateWebstoreIdentityProvider(profile_);
- downloader.reset(new ExtensionDownloader(
- delegate,
- profile_->GetRequestContext()));
- downloader->SetWebstoreIdentityProvider(identity_provider.Pass());
-#endif
- return downloader.Pass();
-}
-
void ExtensionService::ReloadExtensionImpl(
// "transient" because the process of reloading may cause the reference
// to become invalid. Instead, use |extension_id|, a copy.
// we don't do this.
bool external_uninstall =
(reason == extensions::UNINSTALL_REASON_INTERNAL_MANAGEMENT) ||
+ (reason == extensions::UNINSTALL_REASON_REINSTALL) ||
(reason == extensions::UNINSTALL_REASON_ORPHANED_EXTERNAL_EXTENSION) ||
(reason == extensions::UNINSTALL_REASON_ORPHANED_SHARED_MODULE) ||
(reason == extensions::UNINSTALL_REASON_SYNC &&
}
syncer::SyncChange sync_change;
- if (extension_sync_service_) {
+ // Don't sync the uninstall if we're going to reinstall the extension
+ // momentarily.
+ if (extension_sync_service_ &&
+ reason != extensions::UNINSTALL_REASON_REINSTALL) {
sync_change = extension_sync_service_->PrepareToSyncUninstallExtension(
extension.get(), is_ready());
}
ExtensionRegistry::Get(profile_)
->TriggerOnUninstalled(extension.get(), reason);
- if (extension_sync_service_) {
+ if (sync_change.IsValid()) {
extension_sync_service_->ProcessSyncUninstallExtension(extension->id(),
sync_change);
}
extension != to_disable.end(); ++extension) {
if ((*extension)->was_installed_by_default() &&
extension_urls::IsWebstoreUpdateUrl(
- extensions::ManifestURL::GetUpdateURL(*extension)))
+ extensions::ManifestURL::GetUpdateURL(extension->get())))
continue;
const std::string& id = (*extension)->id();
if (except_ids.end() == std::find(except_ids.begin(), except_ids.end(), id))
// storage partition may get destroyed only after the extension gets unloaded.
GURL site =
extensions::util::GetSiteForExtensionId(extension->id(), profile_);
- fileapi::FileSystemContext* filesystem_context =
- BrowserContext::GetStoragePartitionForSite(profile_, site)->
- GetFileSystemContext();
+ storage::FileSystemContext* filesystem_context =
+ BrowserContext::GetStoragePartitionForSite(profile_, site)
+ ->GetFileSystemContext();
if (filesystem_context && filesystem_context->external_backend()) {
filesystem_context->external_backend()->
RevokeAccessForExtension(extension->id());
// to a version that requires additional privileges.
is_privilege_increase =
extensions::PermissionMessageProvider::Get()->IsPrivilegeIncrease(
- granted_permissions,
+ granted_permissions.get(),
extension->permissions_data()->active_permissions().get(),
extension->GetType());
}
}
}
+void ExtensionService::OnExtensionManagementSettingsChanged() {
+ error_controller_->ShowErrorIfNeeded();
+ CheckManagementPolicy();
+}
+
void ExtensionService::AddNewOrUpdatedExtension(
const Extension* extension,
Extension::State initial_state,
return delayed_installs_.GetByID(id);
}
+void ExtensionService::RegisterContentSettings(
+ HostContentSettingsMap* host_content_settings_map) {
+ host_content_settings_map->RegisterProvider(
+ HostContentSettingsMap::INTERNAL_EXTENSION_PROVIDER,
+ scoped_ptr<content_settings::ObservableProvider>(
+ new content_settings::InternalExtensionProvider(this)));
+
+ host_content_settings_map->RegisterProvider(
+ HostContentSettingsMap::CUSTOM_EXTENSION_PROVIDER,
+ scoped_ptr<content_settings::ObservableProvider>(
+ new content_settings::CustomExtensionProvider(
+ extensions::ContentSettingsService::Get(
+ profile_)->content_settings_store(),
+ profile_->GetOriginalProfile() != profile_)));
+}
+
void ExtensionService::TrackTerminatedExtension(const Extension* extension) {
// No need to check for duplicates; inserting a duplicate is a no-op.
registry_->AddTerminated(make_scoped_refptr(extension));
int creation_flags,
bool mark_acknowledged) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- CHECK(Extension::IdIsValid(id));
+ CHECK(crx_file::id_util::IdIsValid(id));
if (extension_prefs_->IsExternalExtensionUninstalled(id))
return false;
}
}
-void ExtensionService::OnExtensionInstallPrefChanged() {
- error_controller_->ShowErrorIfNeeded();
- CheckManagementPolicy();
-}
-
bool ExtensionService::ShouldEnableOnInstall(const Extension* extension) {
// Extensions installed by policy can't be disabled. So even if a previous
// installation disabled the extension, make sure it is now enabled.
projects / platform / framework / web / crosswalk.git / blobdiff