struct UnloadedExtensionInfo -> enum UnloadedExtensionInfoReason
We don't need to keep struct UnloadedExtensionInfo.
So removing it and use enum UnloadedExtensionInfoReason instead.
TEST=Everything runs smoothly
BUG=715144
Review-Url: https://codereview.chromium.org/2839373003
Cr-Commit-Position: refs/heads/master@{#469065}
diff --git a/chrome/browser/apps/app_load_service.cc b/chrome/browser/apps/app_load_service.cc
index 1835b3d..cbf6cdc 100644
--- a/chrome/browser/apps/app_load_service.cc
+++ b/chrome/browser/apps/app_load_service.cc
@@ -130,7 +130,7 @@
void AppLoadService::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
if (!extension->is_platform_app())
return;
@@ -145,8 +145,8 @@
bool AppLoadService::WasUnloadedForReload(
const extensions::ExtensionId& extension_id,
- const extensions::UnloadedExtensionInfo::Reason reason) {
- if (reason == extensions::UnloadedExtensionInfo::REASON_DISABLE) {
+ const extensions::UnloadedExtensionReason reason) {
+ if (reason == extensions::UnloadedExtensionReason::DISABLE) {
ExtensionPrefs* prefs = ExtensionPrefs::Get(context_);
return (prefs->GetDisableReasons(extension_id) &
Extension::DISABLE_RELOAD) != 0;
diff --git a/chrome/browser/apps/app_load_service.h b/chrome/browser/apps/app_load_service.h
index 361ba17..6a47023 100644
--- a/chrome/browser/apps/app_load_service.h
+++ b/chrome/browser/apps/app_load_service.h
@@ -19,10 +19,6 @@
class BrowserContext;
}
-namespace extensions {
-struct UnloadedExtensionInfo;
-}
-
namespace apps {
// Monitors apps being reloaded and performs app specific actions (like launch
@@ -79,14 +75,12 @@
const content::NotificationDetails& details) override;
// extensions::ExtensionRegistryObserver.
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
- bool WasUnloadedForReload(
- const extensions::ExtensionId& extension_id,
- const extensions::UnloadedExtensionInfo::Reason reason);
+ bool WasUnloadedForReload(const extensions::ExtensionId& extension_id,
+ const extensions::UnloadedExtensionReason reason);
bool HasPostReloadAction(const std::string& extension_id);
// Map of extension id to reload action. Absence from the map implies
diff --git a/chrome/browser/autocomplete/shortcuts_extensions_manager.cc b/chrome/browser/autocomplete/shortcuts_extensions_manager.cc
index 8d440422..51a01b7 100644
--- a/chrome/browser/autocomplete/shortcuts_extensions_manager.cc
+++ b/chrome/browser/autocomplete/shortcuts_extensions_manager.cc
@@ -21,7 +21,7 @@
void ShortcutsExtensionsManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
scoped_refptr<ShortcutsBackend> shortcuts_backend =
ShortcutsBackendFactory::GetForProfileIfExists(profile_);
if (!shortcuts_backend)
diff --git a/chrome/browser/autocomplete/shortcuts_extensions_manager.h b/chrome/browser/autocomplete/shortcuts_extensions_manager.h
index cb63abef..4f60a5b 100644
--- a/chrome/browser/autocomplete/shortcuts_extensions_manager.h
+++ b/chrome/browser/autocomplete/shortcuts_extensions_manager.h
@@ -26,10 +26,9 @@
~ShortcutsExtensionsManager() override;
// extensions::ExtensionRegistryObserver:
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnShutdown(extensions::ExtensionRegistry* registry) override;
private:
diff --git a/chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc
index 5d02352..8953854 100644
--- a/chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc
@@ -108,7 +108,7 @@
.SetID("cedabbhfglmiikkmdgcpjdkocfcmbkee")
.Build();
extensions::ExtensionRegistry::Get(&profile_)->TriggerOnUnloaded(
- extension.get(), extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+ extension.get(), extensions::UnloadedExtensionReason::UNINSTALL);
// Now the URL should have disappeared.
RunShortcutsProviderTest(provider_, text, false, ExpectedURLs(),
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc
index ff0cbe19..7c6bef1 100644
--- a/chrome/browser/background/background_application_list_model.cc
+++ b/chrome/browser/background/background_application_list_model.cc
@@ -46,7 +46,7 @@
using extensions::ExtensionRegistry;
using extensions::ExtensionSet;
using extensions::PermissionSet;
-using extensions::UnloadedExtensionInfo;
+using extensions::UnloadedExtensionReason;
using extensions::UpdatedExtensionPermissionsInfo;
class ExtensionNameComparator {
@@ -326,7 +326,7 @@
void BackgroundApplicationListModel::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (!IsBackgroundApp(*extension, profile_))
return;
Update();
diff --git a/chrome/browser/background/background_application_list_model.h b/chrome/browser/background/background_application_list_model.h
index 84f14b0..7abe622b 100644
--- a/chrome/browser/background/background_application_list_model.h
+++ b/chrome/browser/background/background_application_list_model.h
@@ -131,10 +131,9 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnShutdown(extensions::ExtensionRegistry* registry) override;
// Intended to be called when extension system is ready.
diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc
index 085f95c..0dc0cc335 100644
--- a/chrome/browser/background/background_application_list_model_unittest.cc
+++ b/chrome/browser/background/background_application_list_model_unittest.cc
@@ -292,8 +292,8 @@
ASSERT_EQ(1U, model()->size());
extensions::TestExtensionRegistryObserver unload_observer(registry());
- service()->UnloadExtension(
- bgapp->id(), extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+ service()->UnloadExtension(bgapp->id(),
+ extensions::UnloadedExtensionReason::UNINSTALL);
unload_observer.WaitForExtensionUnloaded();
ASSERT_TRUE(registry()->enabled_extensions().is_empty());
EXPECT_EQ(0U, model()->size());
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index 9a30c89..5e79600f 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -70,7 +70,7 @@
using content::WebContents;
using extensions::BackgroundInfo;
using extensions::Extension;
-using extensions::UnloadedExtensionInfo;
+using extensions::UnloadedExtensionReason;
namespace {
@@ -509,19 +509,19 @@
void BackgroundContentsService::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
switch (reason) {
- case UnloadedExtensionInfo::REASON_DISABLE: // Fall through.
- case UnloadedExtensionInfo::REASON_TERMINATE: // Fall through.
- case UnloadedExtensionInfo::REASON_UNINSTALL: // Fall through.
- case UnloadedExtensionInfo::REASON_BLACKLIST: // Fall through.
- case UnloadedExtensionInfo::REASON_LOCK_ALL: // Fall through.
- case UnloadedExtensionInfo::REASON_MIGRATED_TO_COMPONENT: // Fall through.
- case UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN:
+ case UnloadedExtensionReason::DISABLE: // Fall through.
+ case UnloadedExtensionReason::TERMINATE: // Fall through.
+ case UnloadedExtensionReason::UNINSTALL: // Fall through.
+ case UnloadedExtensionReason::BLACKLIST: // Fall through.
+ case UnloadedExtensionReason::LOCK_ALL: // Fall through.
+ case UnloadedExtensionReason::MIGRATED_TO_COMPONENT: // Fall through.
+ case UnloadedExtensionReason::PROFILE_SHUTDOWN:
ShutdownAssociatedBackgroundContents(base::ASCIIToUTF16(extension->id()));
SendChangeNotification(Profile::FromBrowserContext(browser_context));
return;
- case UnloadedExtensionInfo::REASON_UPDATE: {
+ case UnloadedExtensionReason::UPDATE: {
// If there is a manifest specified background page, then shut it down
// here, since if the updated extension still has the background page,
// then it will be loaded from LOADED callback. Otherwise, leave
@@ -533,12 +533,12 @@
base::ASCIIToUTF16(extension->id()));
}
return;
- case UnloadedExtensionInfo::REASON_UNDEFINED:
- // Fall through to undefined case.
- break;
+ case UnloadedExtensionReason::UNDEFINED:
+ // Fall through to undefined case.
+ break;
}
}
- NOTREACHED() << "Undefined case " << reason;
+ NOTREACHED() << "Undefined UnloadedExtensionReason.";
return ShutdownAssociatedBackgroundContents(
base::ASCIIToUTF16(extension->id()));
}
diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index b4192f7..9199bf0 100644
--- a/chrome/browser/background/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.h
@@ -156,10 +156,9 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index 5b840c7..069ca6d6 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -1435,7 +1435,7 @@
void AccessibilityManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
if (extension->id() == keyboard_listener_extension_id_) {
keyboard_listener_extension_id_ = std::string();
keyboard_listener_capture_ = false;
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h
index fea92c28..d71febc 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.h
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -361,10 +361,9 @@
const extensions::api::braille_display_private::KeyEvent& event) override;
// ExtensionRegistryObserver implementation.
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnShutdown(extensions::ExtensionRegistry* registry) override;
// InputMethodManager::Observer
diff --git a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc
index 3da1d9a..8db050e 100644
--- a/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc
+++ b/chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.cc
@@ -55,10 +55,9 @@
const std::string& digest) override;
// extensions::ExtensionRegistryObserver:
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
private:
CertificateProviderService* const service_;
@@ -155,7 +154,7 @@
void DefaultDelegate::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
service_->OnExtensionUnloaded(extension->id());
}
diff --git a/chrome/browser/chromeos/file_system_provider/service.cc b/chrome/browser/chromeos/file_system_provider/service.cc
index 0f5a5ba..fba1b8f 100644
--- a/chrome/browser/chromeos/file_system_provider/service.cc
+++ b/chrome/browser/chromeos/file_system_provider/service.cc
@@ -356,10 +356,9 @@
return true;
}
-void Service::OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+void Service::OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) {
// Unmount all of the provided file systems associated with this extension.
auto it = file_system_map_.begin();
while (it != file_system_map_.end()) {
@@ -371,7 +370,7 @@
if (file_system_info.extension_id() == extension->id()) {
const base::File::Error unmount_result = UnmountFileSystem(
file_system_info.extension_id(), file_system_info.file_system_id(),
- reason == extensions::UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN
+ reason == extensions::UnloadedExtensionReason::PROFILE_SHUTDOWN
? UNMOUNT_REASON_SHUTDOWN
: UNMOUNT_REASON_USER);
DCHECK_EQ(base::File::FILE_OK, unmount_result);
diff --git a/chrome/browser/chromeos/file_system_provider/service.h b/chrome/browser/chromeos/file_system_provider/service.h
index b59f1252..5769cbd9 100644
--- a/chrome/browser/chromeos/file_system_provider/service.h
+++ b/chrome/browser/chromeos/file_system_provider/service.h
@@ -147,10 +147,9 @@
static Service* Get(content::BrowserContext* context);
// extensions::ExtensionRegistryObserver overrides.
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
index 06a10e6..2ced07d 100644
--- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
@@ -367,10 +367,8 @@
ASSERT_EQ(1u, observer.mounts.size());
// Directly call the observer's method.
- service_->OnExtensionUnloaded(
- profile_,
- extension_.get(),
- extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ service_->OnExtensionUnloaded(profile_, extension_.get(),
+ extensions::UnloadedExtensionReason::DISABLE);
ASSERT_EQ(1u, observer.unmounts.size());
EXPECT_EQ(base::File::FILE_OK, observer.unmounts[0].error());
diff --git a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc
index 9640f73..afb326d 100644
--- a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc
+++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc
@@ -152,10 +152,9 @@
cached_listener_extension_ids_.reset();
}
-void Service::OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+void Service::OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) {
// Invalidate cache.
cached_listener_extension_ids_.reset();
}
diff --git a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h
index 4cfcf50..7a648ac 100644
--- a/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h
+++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h
@@ -67,10 +67,9 @@
// extensions::ExtensionRegistryObserver override.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
private:
// Cache listener extension ids and set them to
diff --git a/chrome/browser/chromeos/note_taking_helper.cc b/chrome/browser/chromeos/note_taking_helper.cc
index d6d1846..624ffd2 100644
--- a/chrome/browser/chromeos/note_taking_helper.cc
+++ b/chrome/browser/chromeos/note_taking_helper.cc
@@ -421,7 +421,7 @@
void NoteTakingHelper::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
if (IsWhitelistedChromeApp(extension) ||
extensions::ActionHandlersInfo::HasActionHandler(
extension, app_runtime::ACTION_TYPE_NEW_NOTE)) {
diff --git a/chrome/browser/chromeos/note_taking_helper.h b/chrome/browser/chromeos/note_taking_helper.h
index a938a03..a9837b5 100644
--- a/chrome/browser/chromeos/note_taking_helper.h
+++ b/chrome/browser/chromeos/note_taking_helper.h
@@ -192,10 +192,9 @@
// extensions::ExtensionRegistryObserver:
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnShutdown(extensions::ExtensionRegistry* registry) override;
// True iff Play Store is enabled (i.e. per the checkbox on the settings
diff --git a/chrome/browser/chromeos/note_taking_helper_unittest.cc b/chrome/browser/chromeos/note_taking_helper_unittest.cc
index 108ffa1..c21c1df 100644
--- a/chrome/browser/chromeos/note_taking_helper_unittest.cc
+++ b/chrome/browser/chromeos/note_taking_helper_unittest.cc
@@ -260,7 +260,7 @@
extensions::ExtensionSystem::Get(profile)
->extension_service()
->UnloadExtension(extension->id(),
- extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+ extensions::UnloadedExtensionReason::UNINSTALL);
}
// BrowserWithTestWindowTest:
diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
index d267a570..1b818fe 100644
--- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
+++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
@@ -24,8 +24,6 @@
#include "extensions/common/features/simple_feature.h"
#include "extensions/common/manifest_handlers/plugins_handler.h"
-using extensions::UnloadedExtensionInfo;
-
namespace content_settings {
namespace {
@@ -152,7 +150,7 @@
void InternalExtensionProvider::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
ApplyPluginContentSettingsForExtension(extension, CONTENT_SETTING_DEFAULT);
}
diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.h b/chrome/browser/content_settings/content_settings_internal_extension_provider.h
index c38383a..814f7e7 100644
--- a/chrome/browser/content_settings/content_settings_internal_extension_provider.h
+++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.h
@@ -60,10 +60,9 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
private:
void ApplyPluginContentSettingsForExtension(
diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc
index b24436d8..1732c60 100644
--- a/chrome/browser/extensions/active_tab_permission_granter.cc
+++ b/chrome/browser/extensions/active_tab_permission_granter.cc
@@ -176,7 +176,7 @@
void ActiveTabPermissionGranter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
// Note: don't need to clear the permissions (nor tell the renderer about it)
// because it's being unloaded anyway.
granted_extensions_.Remove(extension->id());
diff --git a/chrome/browser/extensions/active_tab_permission_granter.h b/chrome/browser/extensions/active_tab_permission_granter.h
index 78e1523..a1245a2 100644
--- a/chrome/browser/extensions/active_tab_permission_granter.h
+++ b/chrome/browser/extensions/active_tab_permission_granter.h
@@ -53,7 +53,7 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Clears any tab-specific permissions for all extensions on |tab_id_| and
// notifies renderers.
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 1b9504d5..908d366a 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -295,7 +295,7 @@
ExtensionRegistry* registry =
ExtensionRegistry::Get(web_contents()->GetBrowserContext());
registry->TriggerOnUnloaded(extension.get(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadedExtensionReason::DISABLE);
// Note: can't EXPECT_FALSE(IsAllowed) here because uninstalled extensions
// are just that... considered to be uninstalled, and the manager might
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index 2ab0436..8db97c5 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -681,7 +681,7 @@
void ActivityLog::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (!ActivityLogAPI::IsExtensionWhitelisted(extension->id()))
return;
--active_consumers_;
diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h
index 789617b..a4781d3 100644
--- a/chrome/browser/extensions/activity_log/activity_log.h
+++ b/chrome/browser/extensions/activity_log/activity_log.h
@@ -98,7 +98,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index ee60f40..51a186c 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -290,7 +290,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
Profile* profile_;
scoped_refptr<DevToolsAgentHost> agent_host_;
@@ -422,7 +422,7 @@
void ExtensionDevToolsClientHost::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (extension->id() == extension_id_)
Close();
}
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index 57b3bf7..071e926 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -293,7 +293,7 @@
void DeveloperPrivateEventRouter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
DCHECK(profile_->IsSameProfile(Profile::FromBrowserContext(browser_context)));
BroadcastItemStateChanged(developer::EVENT_TYPE_UNLOADED, extension->id());
}
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
index c284ad5..7b0d29f8 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
@@ -73,7 +73,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionInstalled(content::BrowserContext* browser_context,
const Extension* extension,
bool is_update) override;
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index 9e95f90f..557969f6 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -1910,7 +1910,7 @@
void ExtensionDownloadsEventRouter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::set<const Extension*>::iterator iter =
shelf_disabling_extensions_.find(extension);
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h
index 5cfcf48..448d7703 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.h
+++ b/chrome/browser/extensions/api/downloads/downloads_api.h
@@ -386,10 +386,9 @@
std::unique_ptr<base::Value> json_arg);
// extensions::ExtensionRegistryObserver.
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
Profile* profile_;
AllDownloadItemNotifier notifier_;
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc
index 63cade4..c01110bc 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc
+++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc
@@ -241,7 +241,7 @@
void OperationManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
DeleteOperation(extension->id());
}
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.h b/chrome/browser/extensions/api/image_writer_private/operation_manager.h
index 5243080..56257fa 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_manager.h
+++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.h
@@ -99,7 +99,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
Operation* GetOperation(const ExtensionId& extension_id);
void DeleteOperation(const ExtensionId& extension_id);
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h
index 4dcdce5..21ed2f8 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.h
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -186,7 +186,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// EventRouter::Observer implementation.
void OnListenerAdded(const EventListenerInfo& details) override;
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
index edea935..53b5f0f 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
@@ -627,7 +627,7 @@
void InputImeAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
const std::vector<InputComponentInfo>* input_components =
InputComponents::GetInputComponents(extension);
if (!input_components || input_components->empty())
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
index 4180966..6630ea29 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
@@ -156,7 +156,7 @@
void InputImeAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
InputImeEventRouter* event_router =
GetInputImeEventRouter(Profile::FromBrowserContext(browser_context));
if (event_router) {
diff --git a/chrome/browser/extensions/api/log_private/log_private_api.h b/chrome/browser/extensions/api/log_private/log_private_api.h
index b67ff4ae..9529d5f 100644
--- a/chrome/browser/extensions/api/log_private/log_private_api.h
+++ b/chrome/browser/extensions/api/log_private/log_private_api.h
@@ -87,7 +87,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// NetLog::ThreadSafeObserver implementation:
void OnAddEntry(const net::NetLogEntry& entry) override;
diff --git a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
index 9d19714..44f8d040 100644
--- a/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
+++ b/chrome/browser/extensions/api/log_private/log_private_api_chromeos.cc
@@ -408,7 +408,7 @@
void LogPrivateAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
StopNetInternalsWatch(extension->id(), base::Closure());
}
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 91a4bca..4481257 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -233,7 +233,7 @@
void OmniboxAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (!OmniboxInfo::GetKeyword(extension).empty() && url_service_) {
if (url_service_->loaded()) {
url_service_->RemoveExtensionControlledTURL(
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h
index 5fbec3e..2548083 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.h
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h
@@ -111,7 +111,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() {
diff --git a/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc b/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc
index 4bdc91e..601e93f 100644
--- a/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc
+++ b/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc
@@ -119,7 +119,7 @@
void VerifyTrustAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
content::BrowserThread::PostTask(
content::BrowserThread::IO, FROM_HERE,
base::Bind(&IOPart::OnExtensionUnloaded, base::Unretained(io_part_.get()),
diff --git a/chrome/browser/extensions/api/platform_keys/verify_trust_api.h b/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
index 1d88b3e..85a022ff 100644
--- a/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
+++ b/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
@@ -64,7 +64,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI:
static BrowserContextKeyedAPIFactory<VerifyTrustAPI>* GetFactoryInstance();
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
index a40ff4cc..4305f6a 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
@@ -197,7 +197,7 @@
void SettingsOverridesAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
const SettingsOverrides* settings = SettingsOverrides::Get(extension);
if (settings) {
if (settings->homepage) {
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
index 89fd425..3c80f897 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
@@ -45,7 +45,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void RegisterSearchProvider(const Extension* extension) const;
// BrowserContextKeyedAPI implementation.
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
index c8feb04..ae8a0387 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
@@ -158,7 +158,7 @@
void SignedInDevicesManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
RemoveChangeObserverForExtension(extension->id());
}
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
index c3e0b9d..4881532 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h
@@ -73,7 +73,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// EventRouter::Observer:
void OnListenerAdded(const EventListenerInfo& details) override;
diff --git a/chrome/browser/extensions/api/spellcheck/spellcheck_api.cc b/chrome/browser/extensions/api/spellcheck/spellcheck_api.cc
index 517086ec..964a4bbd 100644
--- a/chrome/browser/extensions/api/spellcheck/spellcheck_api.cc
+++ b/chrome/browser/extensions/api/spellcheck/spellcheck_api.cc
@@ -74,7 +74,7 @@
void SpellcheckAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
SpellcheckDictionaryInfo* spellcheck_info =
GetSpellcheckDictionaryInfo(extension);
if (spellcheck_info) {
diff --git a/chrome/browser/extensions/api/spellcheck/spellcheck_api.h b/chrome/browser/extensions/api/spellcheck/spellcheck_api.h
index 5acb376..71ed27a 100644
--- a/chrome/browser/extensions/api/spellcheck/spellcheck_api.h
+++ b/chrome/browser/extensions/api/spellcheck/spellcheck_api.h
@@ -30,7 +30,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() {
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/chrome/browser/extensions/api/streams_private/streams_private_api.cc
index 4e20405..286b0bab 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_api.cc
+++ b/chrome/browser/extensions/api/streams_private/streams_private_api.cc
@@ -160,7 +160,7 @@
void StreamsPrivateAPI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
streams_.erase(extension->id());
}
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.h b/chrome/browser/extensions/api/streams_private/streams_private_api.h
index 3d987d4..4bca449 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_api.h
+++ b/chrome/browser/extensions/api/streams_private/streams_private_api.h
@@ -66,7 +66,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() {
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
index 1f44504..eacadc7 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc
@@ -137,7 +137,7 @@
void SystemIndicatorManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
RemoveIndicator(extension->id());
}
diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
index fe024985..7604511 100644
--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h
@@ -46,7 +46,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// ExtensionActionAPI::Observer implementation.
void OnExtensionActionUpdated(
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
index 6ad2f25..c1fe19aea 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
@@ -285,7 +285,7 @@
void TabCaptureRegistry::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
// Cleanup all the requested media streams for this extension.
for (std::vector<std::unique_ptr<LiveRequest>>::iterator it =
requests_.begin();
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
index f0eb905..4d4abd6 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
@@ -88,7 +88,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// MediaCaptureDevicesDispatcher::Observer implementation.
void OnRequestUpdate(int original_target_render_process_id,
diff --git a/chrome/browser/extensions/chrome_theme_url_browsertest.cc b/chrome/browser/extensions/chrome_theme_url_browsertest.cc
index c737d5c..7402a16 100644
--- a/chrome/browser/extensions/chrome_theme_url_browsertest.cc
+++ b/chrome/browser/extensions/chrome_theme_url_browsertest.cc
@@ -26,7 +26,7 @@
// Unload the extension so we can reload it below with no chance of side
// effects.
extension_service()->UnloadExtension(extension->id(),
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadedExtensionReason::UNINSTALL);
listener.Reset();
// Now try loading the extension as a component extension. This time the
diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc
index 496a6c5f..b2c7310 100644
--- a/chrome/browser/extensions/component_loader_unittest.cc
+++ b/chrome/browser/extensions/component_loader_unittest.cc
@@ -51,7 +51,7 @@
}
void UnloadExtension(const std::string& extension_id,
- UnloadedExtensionInfo::Reason reason) override {
+ UnloadedExtensionReason reason) override {
ASSERT_TRUE(registry_->enabled_extensions().Contains(extension_id));
// Remove the extension with the matching id.
registry_->RemoveEnabled(extension_id);
@@ -59,7 +59,7 @@
}
void RemoveComponentExtension(const std::string& extension_id) override {
- UnloadExtension(extension_id, UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadExtension(extension_id, UnloadedExtensionReason::DISABLE);
}
bool is_ready() override { return ready_; }
diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc
index 63c6b04..4a83527 100644
--- a/chrome/browser/extensions/content_verifier_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -84,7 +84,7 @@
// ExtensionRegistryObserver
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override {
+ UnloadedExtensionReason reason) override {
unloaded_.insert(extension->id());
if (awaited_unload_id_ == extension->id()) {
awaited_unload_id_.clear();
diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc
index 079171d8..29053b0d 100644
--- a/chrome/browser/extensions/error_console/error_console.cc
+++ b/chrome/browser/extensions/error_console/error_console.cc
@@ -229,7 +229,7 @@
void ErrorConsole::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
CheckEnabled();
}
diff --git a/chrome/browser/extensions/error_console/error_console.h b/chrome/browser/extensions/error_console/error_console.h
index b50d558..2ab5a805 100644
--- a/chrome/browser/extensions/error_console/error_console.h
+++ b/chrome/browser/extensions/error_console/error_console.h
@@ -144,7 +144,7 @@
// installed or uninstalled, we may need to turn the ErrorConsole on/off.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionLoaded(content::BrowserContext* browser_context,
const Extension* extension) override;
void OnExtensionInstalled(content::BrowserContext* browser_context,
diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc
index 71f77e2..e13b286 100644
--- a/chrome/browser/extensions/error_console/error_console_unittest.cc
+++ b/chrome/browser/extensions/error_console/error_console_unittest.cc
@@ -124,7 +124,7 @@
// Unloading the Apps Developer Tools should disable error console.
registry->RemoveEnabled(adt->id());
- registry->TriggerOnUnloaded(adt.get(), UnloadedExtensionInfo::REASON_DISABLE);
+ registry->TriggerOnUnloaded(adt.get(), UnloadedExtensionReason::DISABLE);
EXPECT_FALSE(error_console_->enabled());
EXPECT_FALSE(error_console_->IsEnabledForChromeExtensionsPage());
EXPECT_FALSE(error_console_->IsEnabledForAppsDeveloperTools());
diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc
index 45a52d9..aefbcc0 100644
--- a/chrome/browser/extensions/extension_action_manager.cc
+++ b/chrome/browser/extensions/extension_action_manager.cc
@@ -79,7 +79,7 @@
void ExtensionActionManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
page_actions_.erase(extension->id());
browser_actions_.erase(extension->id());
system_indicators_.erase(extension->id());
diff --git a/chrome/browser/extensions/extension_action_manager.h b/chrome/browser/extensions/extension_action_manager.h
index 6693d81..054768c 100644
--- a/chrome/browser/extensions/extension_action_manager.h
+++ b/chrome/browser/extensions/extension_action_manager.h
@@ -60,7 +60,7 @@
// Implement ExtensionRegistryObserver.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
Profile* profile_;
diff --git a/chrome/browser/extensions/extension_action_runner.cc b/chrome/browser/extensions/extension_action_runner.cc
index 5261c38..aba92757 100644
--- a/chrome/browser/extensions/extension_action_runner.cc
+++ b/chrome/browser/extensions/extension_action_runner.cc
@@ -419,7 +419,7 @@
void ExtensionActionRunner::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
PendingScriptMap::iterator iter = pending_scripts_.find(extension->id());
if (iter != pending_scripts_.end()) {
pending_scripts_.erase(iter);
diff --git a/chrome/browser/extensions/extension_action_runner.h b/chrome/browser/extensions/extension_action_runner.h
index a7ab6e3e..f29a0d77 100644
--- a/chrome/browser/extensions/extension_action_runner.h
+++ b/chrome/browser/extensions/extension_action_runner.h
@@ -170,7 +170,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// The total number of requests from the renderer on the current page,
// including any that are pending or were immediately granted.
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index b425a443..7de23ab 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -515,7 +515,7 @@
ExtensionService* service = extensions::ExtensionSystem::Get(
profile())->extension_service();
service->UnloadExtension(extension_id,
- extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extensions::UnloadedExtensionReason::DISABLE);
}
void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) {
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.cc b/chrome/browser/extensions/extension_gcm_app_handler.cc
index 7e6ef5c2..61970ad 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler.cc
@@ -106,11 +106,11 @@
void ExtensionGCMAppHandler::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (!IsGCMPermissionEnabled(extension))
return;
- if (reason == UnloadedExtensionInfo::REASON_UPDATE &&
+ if (reason == UnloadedExtensionReason::UPDATE &&
GetGCMDriver()->app_handlers().size() >= 1) {
// When the extension is being updated, it will be first unloaded and then
// loaded again by ExtensionService::AddExtension. If the app handler for
@@ -138,7 +138,7 @@
// When the extention is being uninstalled, it will be unloaded first. We
// should not remove the app handler in this case and it will be handled
// in OnExtensionUninstalled.
- if (reason != UnloadedExtensionInfo::REASON_UNINSTALL)
+ if (reason != UnloadedExtensionReason::UNINSTALL)
RemoveAppHandler(extension->id());
}
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.h b/chrome/browser/extensions/extension_gcm_app_handler.h
index 33f03ed..8201a678 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler.h
+++ b/chrome/browser/extensions/extension_gcm_app_handler.h
@@ -82,7 +82,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc
index 1800970..615deb9 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.cc
+++ b/chrome/browser/extensions/extension_keybinding_registry.cc
@@ -182,7 +182,7 @@
void ExtensionKeybindingRegistry::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (ExtensionMatchesFilter(extension))
RemoveExtensionKeybinding(extension, std::string());
}
diff --git a/chrome/browser/extensions/extension_keybinding_registry.h b/chrome/browser/extensions/extension_keybinding_registry.h
index fdc85df2..6df47a5 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.h
+++ b/chrome/browser/extensions/extension_keybinding_registry.h
@@ -141,7 +141,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Returns true if the |extension| matches our extension filter.
bool ExtensionMatchesFilter(const extensions::Extension* extension);
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index b2019ed..654b538 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -377,7 +377,7 @@
// And then test it with the extension disabled.
extension_info_map_->RemoveExtension(extension->id(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadedExtensionReason::DISABLE);
{
std::unique_ptr<net::URLRequest> request(
resource_context_.GetRequestContext()->CreateRequest(
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 7f8b30c..ad71689 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -133,7 +133,7 @@
using extensions::PermissionSet;
using extensions::SharedModuleInfo;
using extensions::SharedModuleService;
-using extensions::UnloadedExtensionInfo;
+using extensions::UnloadedExtensionReason;
namespace {
@@ -821,7 +821,7 @@
// Unload before doing more cleanup to ensure that nothing is hanging on to
// any of these resources.
- UnloadExtension(extension->id(), UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadExtension(extension->id(), UnloadedExtensionReason::UNINSTALL);
if (registry_->blacklisted_extensions().Contains(extension->id()))
registry_->RemoveBlacklisted(extension->id());
@@ -991,7 +991,7 @@
registry_->AddDisabled(make_scoped_refptr(extension));
if (registry_->enabled_extensions().Contains(extension->id())) {
registry_->RemoveEnabled(extension->id());
- NotifyExtensionUnloaded(extension, UnloadedExtensionInfo::REASON_DISABLE);
+ NotifyExtensionUnloaded(extension, UnloadedExtensionReason::DISABLE);
} else {
registry_->RemoveTerminated(extension->id());
}
@@ -1049,7 +1049,7 @@
registry_->RemoveTerminated(id);
registry_->AddBlocked(extension.get());
- UnloadExtension(id, extensions::UnloadedExtensionInfo::REASON_LOCK_ALL);
+ UnloadExtension(id, extensions::UnloadedExtensionReason::LOCK_ALL);
}
}
@@ -1169,9 +1169,8 @@
registry_->TriggerOnReady(extension.get());
}
-void ExtensionService::NotifyExtensionUnloaded(
- const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+void ExtensionService::NotifyExtensionUnloaded(const Extension* extension,
+ UnloadedExtensionReason reason) {
registry_->TriggerOnUnloaded(extension, reason);
renderer_helper_->OnExtensionUnloaded(*extension);
@@ -1287,7 +1286,7 @@
}
for (const std::string& id : to_unload)
- UnloadExtension(id, UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadExtension(id, UnloadedExtensionReason::DISABLE);
for (const auto& i : to_disable)
DisableExtension(i.first, i.second);
@@ -1402,9 +1401,8 @@
external_install_manager_->UpdateExternalExtensionAlert();
}
-void ExtensionService::UnloadExtension(
- const std::string& extension_id,
- UnloadedExtensionInfo::Reason reason) {
+void ExtensionService::UnloadExtension(const std::string& extension_id,
+ UnloadedExtensionReason reason) {
// Make sure the extension gets deleted after we return from this function.
int include_mask =
ExtensionRegistry::EVERYTHING & ~ExtensionRegistry::TERMINATED;
@@ -1451,7 +1449,7 @@
const std::string& extension_id) {
scoped_refptr<const Extension> extension(
GetExtensionById(extension_id, false));
- UnloadExtension(extension_id, UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadExtension(extension_id, UnloadedExtensionReason::UNINSTALL);
if (extension.get()) {
ExtensionRegistry::Get(profile_)->TriggerOnUninstalled(
extension.get(), extensions::UNINSTALL_REASON_COMPONENT_REMOVED);
@@ -1568,7 +1566,7 @@
if (is_extension_loaded && !reloading) {
// To upgrade an extension in place, unload the old one and then load the
// new one. ReloadExtension disables the extension, which is sufficient.
- UnloadExtension(extension->id(), UnloadedExtensionInfo::REASON_UPDATE);
+ UnloadExtension(extension->id(), UnloadedExtensionReason::UPDATE);
}
if (extension_prefs_->IsExtensionBlacklisted(extension->id())) {
@@ -2077,7 +2075,7 @@
// No need to check for duplicates; inserting a duplicate is a no-op.
registry_->AddTerminated(make_scoped_refptr(extension));
- UnloadExtension(extension->id(), UnloadedExtensionInfo::REASON_TERMINATE);
+ UnloadExtension(extension->id(), UnloadedExtensionReason::TERMINATE);
}
void ExtensionService::TerminateExtension(const std::string& extension_id) {
@@ -2471,7 +2469,7 @@
registry_->AddBlacklisted(extension);
extension_prefs_->SetExtensionBlacklistState(
extension->id(), extensions::BLACKLISTED_MALWARE);
- UnloadExtension(*it, UnloadedExtensionInfo::REASON_BLACKLIST);
+ UnloadExtension(*it, UnloadedExtensionReason::BLACKLIST);
UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlacklistInstalled",
extension->location(), Manifest::NUM_LOCATIONS);
}
@@ -2565,6 +2563,6 @@
for (ExtensionIdSet::iterator it = ids_to_unload.begin();
it != ids_to_unload.end();
++it) {
- UnloadExtension(*it, UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN);
+ UnloadExtension(*it, UnloadedExtensionReason::PROFILE_SHUTDOWN);
}
}
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 815f383..9ebe85b9 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -160,9 +160,8 @@
const extensions::Extension* extension) = 0;
// Unload the specified extension.
- virtual void UnloadExtension(
- const std::string& extension_id,
- extensions::UnloadedExtensionInfo::Reason reason) = 0;
+ virtual void UnloadExtension(const std::string& extension_id,
+ extensions::UnloadedExtensionReason reason) = 0;
// Remove the specified component extension.
virtual void RemoveComponentExtension(const std::string& extension_id) = 0;
@@ -215,9 +214,8 @@
bool file_ownership_passed,
extensions::CrxInstaller** out_crx_installer) override;
bool IsExtensionEnabled(const std::string& extension_id) const override;
- void UnloadExtension(
- const std::string& extension_id,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void UnloadExtension(const std::string& extension_id,
+ extensions::UnloadedExtensionReason reason) override;
void RemoveComponentExtension(const std::string& extension_id) override;
void AddExtension(const extensions::Extension* extension) override;
void AddComponentExtension(const extensions::Extension* extension) override;
@@ -527,9 +525,8 @@
scoped_refptr<const extensions::Extension> extension);
// Handles sending notification that |extension| was unloaded.
- void NotifyExtensionUnloaded(
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason);
+ void NotifyExtensionUnloaded(const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason);
// Common helper to finish installing the given extension.
void FinishInstallation(const extensions::Extension* extension);
diff --git a/chrome/browser/extensions/extension_service_test_with_install.cc b/chrome/browser/extensions/extension_service_test_with_install.cc
index e4706a1..2c994aa 100644
--- a/chrome/browser/extensions/extension_service_test_with_install.cc
+++ b/chrome/browser/extensions/extension_service_test_with_install.cc
@@ -41,10 +41,11 @@
ExtensionServiceTestWithInstall::ExtensionServiceTestWithInstall()
: installed_(nullptr),
was_update_(false),
- unloaded_reason_(UnloadedExtensionInfo::REASON_UNDEFINED),
+ unloaded_reason_(UnloadedExtensionReason::UNDEFINED),
expected_extensions_count_(0),
override_external_install_prompt_(
- FeatureSwitch::prompt_for_external_extensions(), false),
+ FeatureSwitch::prompt_for_external_extensions(),
+ false),
registry_observer_(this) {}
ExtensionServiceTestWithInstall::~ExtensionServiceTestWithInstall() {}
@@ -389,7 +390,7 @@
void ExtensionServiceTestWithInstall::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
unloaded_id_ = extension->id();
unloaded_reason_ = reason;
extensions::ExtensionList::iterator i =
diff --git a/chrome/browser/extensions/extension_service_test_with_install.h b/chrome/browser/extensions/extension_service_test_with_install.h
index 92bd6cc..8cec6c3 100644
--- a/chrome/browser/extensions/extension_service_test_with_install.h
+++ b/chrome/browser/extensions/extension_service_test_with_install.h
@@ -124,7 +124,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionWillBeInstalled(content::BrowserContext* browser_context,
const Extension* extension,
bool is_update,
@@ -136,7 +136,7 @@
bool was_update_;
std::string old_name_;
std::string unloaded_id_;
- UnloadedExtensionInfo::Reason unloaded_reason_;
+ UnloadedExtensionReason unloaded_reason_;
private:
void InstallCRXInternal(const base::FilePath& crx_path,
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 4862477..a870c20 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -182,7 +182,7 @@
using extensions::MockExternalProvider;
using extensions::PermissionSet;
using extensions::TestExtensionSystem;
-using extensions::UnloadedExtensionInfo;
+using extensions::UnloadedExtensionReason;
using extensions::URLPatternSet;
namespace keys = extensions::manifest_keys;
@@ -4417,7 +4417,7 @@
EXPECT_EQ(1u, registry()->enabled_extensions().size());
UninstallExtension(good_crx, false);
EXPECT_EQ(0u, registry()->enabled_extensions().size());
- EXPECT_EQ(UnloadedExtensionInfo::REASON_UNINSTALL, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::UNINSTALL, unloaded_reason_);
}
TEST_F(ExtensionServiceTest, UninstallTerminatedExtension) {
@@ -4425,7 +4425,7 @@
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
UninstallExtension(good_crx, false);
- EXPECT_EQ(UnloadedExtensionInfo::REASON_TERMINATE, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::TERMINATE, unloaded_reason_);
}
// Tests the uninstaller helper.
@@ -4433,7 +4433,7 @@
InitializeEmptyExtensionService();
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
UninstallExtension(good_crx, true);
- EXPECT_EQ(UnloadedExtensionInfo::REASON_UNINSTALL, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::UNINSTALL, unloaded_reason_);
}
TEST_F(ExtensionServiceTest, UninstallExtensionHelperTerminated) {
@@ -4441,7 +4441,7 @@
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
UninstallExtension(good_crx, true);
- EXPECT_EQ(UnloadedExtensionInfo::REASON_TERMINATE, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::TERMINATE, unloaded_reason_);
}
// An extension disabled because of unsupported requirements should re-enabled
@@ -6866,7 +6866,7 @@
InitializeEmptyExtensionService();
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
- EXPECT_NE(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_);
+ EXPECT_NE(UnloadedExtensionReason::PROFILE_SHUTDOWN, unloaded_reason_);
EXPECT_EQ(1u, registry()->enabled_extensions().size());
EXPECT_EQ(0u, registry()->disabled_extensions().size());
EXPECT_EQ(0u, registry()->terminated_extensions().size());
@@ -6875,7 +6875,7 @@
service()->Observe(chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED,
content::Source<Profile>(profile()),
content::NotificationService::NoDetails());
- EXPECT_EQ(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_);
+ EXPECT_EQ(UnloadedExtensionReason::PROFILE_SHUTDOWN, unloaded_reason_);
EXPECT_EQ(0u, registry()->enabled_extensions().size());
EXPECT_EQ(0u, registry()->disabled_extensions().size());
EXPECT_EQ(0u, registry()->terminated_extensions().size());
diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc
index 4d37a95a..530adf8cb 100644
--- a/chrome/browser/extensions/extension_storage_monitor.cc
+++ b/chrome/browser/extensions/extension_storage_monitor.cc
@@ -303,7 +303,7 @@
void ExtensionStorageMonitor::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
StopMonitoringStorage(extension->id());
}
diff --git a/chrome/browser/extensions/extension_storage_monitor.h b/chrome/browser/extensions/extension_storage_monitor.h
index 31f4a9ef..8c59fd5b 100644
--- a/chrome/browser/extensions/extension_storage_monitor.h
+++ b/chrome/browser/extensions/extension_storage_monitor.h
@@ -64,7 +64,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionWillBeInstalled(content::BrowserContext* browser_context,
const Extension* extension,
bool is_update,
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index ce9b92141..251b8a2 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -461,7 +461,7 @@
void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
const std::string& extension_id,
- const UnloadedExtensionInfo::Reason reason) {
+ const UnloadedExtensionReason reason) {
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::BindOnce(&InfoMap::RemoveExtension, info_map(),
extension_id, reason));
diff --git a/chrome/browser/extensions/extension_system_impl.h b/chrome/browser/extensions/extension_system_impl.h
index fb8d8f1d..68c6b64 100644
--- a/chrome/browser/extensions/extension_system_impl.h
+++ b/chrome/browser/extensions/extension_system_impl.h
@@ -66,7 +66,7 @@
void UnregisterExtensionWithRequestContexts(
const std::string& extension_id,
- const UnloadedExtensionInfo::Reason reason) override;
+ const UnloadedExtensionReason reason) override;
const OneShotEvent& ready() const override;
ContentVerifier* content_verifier() override; // shared
diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.cc b/chrome/browser/extensions/extension_web_ui_override_registrar.cc
index ca8f86f1..eb427c6 100644
--- a/chrome/browser/extensions/extension_web_ui_override_registrar.cc
+++ b/chrome/browser/extensions/extension_web_ui_override_registrar.cc
@@ -41,7 +41,7 @@
void ExtensionWebUIOverrideRegistrar::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
ExtensionWebUI::DeactivateChromeURLOverrides(
Profile::FromBrowserContext(browser_context),
URLOverrides::GetChromeURLOverrides(extension));
diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.h b/chrome/browser/extensions/extension_web_ui_override_registrar.h
index 93c7e56c..6436529 100644
--- a/chrome/browser/extensions/extension_web_ui_override_registrar.h
+++ b/chrome/browser/extensions/extension_web_ui_override_registrar.h
@@ -36,7 +36,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const Extension* extension,
UninstallReason reason) override;
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 2235cca..f4774c5 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -75,7 +75,7 @@
private:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override {
+ UnloadedExtensionReason reason) override {
original_complete_.reset(new LazyBackgroundObserver(profile_));
incognito_complete_.reset(
new LazyBackgroundObserver(profile_->GetOffTheRecordProfile()));
diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc
index 7bfaf2d..fee129e 100644
--- a/chrome/browser/extensions/menu_manager.cc
+++ b/chrome/browser/extensions/menu_manager.cc
@@ -855,7 +855,7 @@
void MenuManager::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
MenuItem::ExtensionKey extension_key(extension->id());
if (base::ContainsKey(context_items_, extension_key)) {
RemoveAllContextItems(extension_key);
diff --git a/chrome/browser/extensions/menu_manager.h b/chrome/browser/extensions/menu_manager.h
index ec9f8a4..06f21209 100644
--- a/chrome/browser/extensions/menu_manager.h
+++ b/chrome/browser/extensions/menu_manager.h
@@ -360,7 +360,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Stores the menu items for the extension in the state storage.
void WriteToStorage(const Extension* extension,
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index 871c0b7e..da6b3a45 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -459,8 +459,7 @@
// Notify that the extension was unloaded, and make sure the right item is
// gone.
ExtensionRegistry* registry = ExtensionRegistry::Get(profile_.get());
- registry->TriggerOnUnloaded(extension1,
- UnloadedExtensionInfo::REASON_DISABLE);
+ registry->TriggerOnUnloaded(extension1, UnloadedExtensionReason::DISABLE);
ASSERT_EQ(NULL, manager_.MenuItems(MenuItem::ExtensionKey(extension1->id())));
ASSERT_EQ(
diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc
index 688f79f..ca880b4 100644
--- a/chrome/browser/extensions/plugin_manager.cc
+++ b/chrome/browser/extensions/plugin_manager.cc
@@ -97,7 +97,7 @@
void PluginManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
bool plugins_or_nacl_changed = false;
#if !defined(DISABLE_NACL)
const NaClModuleInfo::List* nacl_modules =
diff --git a/chrome/browser/extensions/plugin_manager.h b/chrome/browser/extensions/plugin_manager.h
index b0424ab..4f1257d 100644
--- a/chrome/browser/extensions/plugin_manager.h
+++ b/chrome/browser/extensions/plugin_manager.h
@@ -59,7 +59,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() { return "PluginManager"; }
diff --git a/chrome/browser/extensions/renderer_initialization_browsertest.cc b/chrome/browser/extensions/renderer_initialization_browsertest.cc
index 139e939..4f6eef6 100644
--- a/chrome/browser/extensions/renderer_initialization_browsertest.cc
+++ b/chrome/browser/extensions/renderer_initialization_browsertest.cc
@@ -28,7 +28,7 @@
ui::PAGE_TRANSITION_TYPED, false));
// Without waiting for the tab to finish, unload the extension.
extension_service()->UnloadExtension(extension->id(),
- UnloadedExtensionInfo::REASON_TERMINATE);
+ UnloadedExtensionReason::TERMINATE);
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
// Wait for the web contents to stop loading.
diff --git a/chrome/browser/extensions/shared_user_script_master.cc b/chrome/browser/extensions/shared_user_script_master.cc
index 0b084fa..201dfff 100644
--- a/chrome/browser/extensions/shared_user_script_master.cc
+++ b/chrome/browser/extensions/shared_user_script_master.cc
@@ -34,7 +34,7 @@
void SharedUserScriptMaster::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
const UserScriptList& script_list =
ContentScriptsInfo::GetContentScripts(extension);
std::set<UserScriptIDPair> scripts_to_remove;
diff --git a/chrome/browser/extensions/shared_user_script_master.h b/chrome/browser/extensions/shared_user_script_master.h
index b3e99cff..d3319972 100644
--- a/chrome/browser/extensions/shared_user_script_master.h
+++ b/chrome/browser/extensions/shared_user_script_master.h
@@ -41,7 +41,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Gets an extension's scripts' metadata; i.e., gets a list of UserScript
// objects that contains script info, but not the contents of the scripts.
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index d04d905..3ba0c93c 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -614,10 +614,9 @@
return web_contents();
}
-void TabHelper::OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+void TabHelper::OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const Extension* extension,
+ UnloadedExtensionReason reason) {
DCHECK(extension_app_);
if (extension == extension_app_)
SetExtensionApp(nullptr);
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h
index 5e81fba..09b09f6 100644
--- a/chrome/browser/extensions/tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -152,7 +152,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Message handlers.
void OnDidGetWebApplicationInfo(const WebApplicationInfo& info);
diff --git a/chrome/browser/extensions/tab_helper_unittest.cc b/chrome/browser/extensions/tab_helper_unittest.cc
index 175c222..6b48dc8 100644
--- a/chrome/browser/extensions/tab_helper_unittest.cc
+++ b/chrome/browser/extensions/tab_helper_unittest.cc
@@ -24,7 +24,7 @@
EXPECT_EQ(extension, tab_helper->extension_app());
EXPECT_TRUE(tab_helper->is_app());
service()->UnloadExtension(extension->id(),
- UnloadedExtensionInfo::REASON_UNDEFINED);
+ UnloadedExtensionReason::UNDEFINED);
base::RunLoop().RunUntilIdle();
EXPECT_EQ(nullptr, tab_helper->extension_app());
}
diff --git a/chrome/browser/extensions/test_extension_service.cc b/chrome/browser/extensions/test_extension_service.cc
index ae2c2b8..acd59938 100644
--- a/chrome/browser/extensions/test_extension_service.cc
+++ b/chrome/browser/extensions/test_extension_service.cc
@@ -81,7 +81,7 @@
void TestExtensionService::UnloadExtension(
const std::string& extension_id,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
ADD_FAILURE();
}
diff --git a/chrome/browser/extensions/test_extension_service.h b/chrome/browser/extensions/test_extension_service.h
index 64d0ab3..6a553d8 100644
--- a/chrome/browser/extensions/test_extension_service.h
+++ b/chrome/browser/extensions/test_extension_service.h
@@ -48,9 +48,8 @@
void AddExtension(const extensions::Extension* extension) override;
void AddComponentExtension(const extensions::Extension* extension) override;
- void UnloadExtension(
- const std::string& extension_id,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void UnloadExtension(const std::string& extension_id,
+ extensions::UnloadedExtensionReason reason) override;
void RemoveComponentExtension(const std::string& extension_id) override;
};
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc
index 36ebb6ac..3109b91 100644
--- a/chrome/browser/extensions/user_script_listener.cc
+++ b/chrome/browser/extensions/user_script_listener.cc
@@ -267,7 +267,7 @@
void UserScriptListener::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (ContentScriptsInfo::GetContentScripts(extension).empty())
return; // No patterns to delete for this extension.
diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h
index 951a16f4..2eeda6f 100644
--- a/chrome/browser/extensions/user_script_listener.h
+++ b/chrome/browser/extensions/user_script_listener.h
@@ -113,7 +113,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnShutdown(ExtensionRegistry* registry) override;
ScopedObserver<extensions::ExtensionRegistry,
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index bdc92d7..80d206f 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -214,7 +214,7 @@
ExtensionRegistry::Get(profile_)->enabled_extensions();
ASSERT_FALSE(extensions.is_empty());
service_->UnloadExtension((*extensions.begin())->id(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadedExtensionReason::DISABLE);
}
content::TestBrowserThreadBundle thread_bundle_;
diff --git a/chrome/browser/notifications/notification_system_observer.cc b/chrome/browser/notifications/notification_system_observer.cc
index 427a894..c6c8d889 100644
--- a/chrome/browser/notifications/notification_system_observer.cc
+++ b/chrome/browser/notifications/notification_system_observer.cc
@@ -64,7 +64,7 @@
void NotificationSystemObserver::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
ui_manager_->CancelAllBySourceOrigin(extension->url());
}
diff --git a/chrome/browser/notifications/notification_system_observer.h b/chrome/browser/notifications/notification_system_observer.h
index a6e0a4d6..e0d69a1f 100644
--- a/chrome/browser/notifications/notification_system_observer.h
+++ b/chrome/browser/notifications/notification_system_observer.h
@@ -36,10 +36,9 @@
const content::NotificationDetails& details) override;
// extensions::ExtensionRegistryObserver override.
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnShutdown(extensions::ExtensionRegistry* registry) override;
private:
diff --git a/chrome/browser/notifications/notification_system_observer_unittest.cc b/chrome/browser/notifications/notification_system_observer_unittest.cc
index 8f9e97c..6206402 100644
--- a/chrome/browser/notifications/notification_system_observer_unittest.cc
+++ b/chrome/browser/notifications/notification_system_observer_unittest.cc
@@ -64,7 +64,7 @@
ASSERT_NE(extension->url(), ui_manager()->last_canceled_source());
// Claim the extension has been unloaded.
extensions::ExtensionRegistry::Get(profile())->TriggerOnUnloaded(
- extension.get(), extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+ extension.get(), extensions::UnloadedExtensionReason::UNINSTALL);
// Check the NotificationUIManger has canceled the source coming from the
// unloaded extension.
EXPECT_EQ(extension->url(), ui_manager()->last_canceled_source());
@@ -75,6 +75,6 @@
CreateGoodExtension("bar");
// Claim the extension has been unloaded with anoter profile.
extensions::ExtensionRegistry::Get(profile2)->TriggerOnUnloaded(
- extension2.get(), extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+ extension2.get(), extensions::UnloadedExtensionReason::UNINSTALL);
EXPECT_EQ(extension2->url(), ui_manager()->last_canceled_source());
}
diff --git a/chrome/browser/signin/easy_unlock_app_manager_unittest.cc b/chrome/browser/signin/easy_unlock_app_manager_unittest.cc
index 84698c1f9..9353958 100644
--- a/chrome/browser/signin/easy_unlock_app_manager_unittest.cc
+++ b/chrome/browser/signin/easy_unlock_app_manager_unittest.cc
@@ -113,7 +113,7 @@
void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override {
+ extensions::UnloadedExtensionReason reason) override {
ASSERT_FALSE(unloaded_);
ASSERT_EQ(extension_id_, extension->id());
unloaded_ = true;
diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc
index 852621e..22d5a474 100644
--- a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc
+++ b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc
@@ -119,7 +119,7 @@
void TtsEngineExtensionObserver::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
if (engine_extension_ids_.find(extension->id()) !=
engine_extension_ids_.end()) {
engine_extension_ids_.erase(extension->id());
diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_observer.h b/chrome/browser/speech/extension_api/tts_engine_extension_observer.h
index a7956a5..5e1f79c 100644
--- a/chrome/browser/speech/extension_api/tts_engine_extension_observer.h
+++ b/chrome/browser/speech/extension_api/tts_engine_extension_observer.h
@@ -34,10 +34,9 @@
void OnListenerAdded(const extensions::EventListenerInfo& details) override;
// extensions::ExtensionRegistryObserver overrides.
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
private:
explicit TtsEngineExtensionObserver(Profile* profile);
diff --git a/chrome/browser/sync/test/integration/apps_helper.cc b/chrome/browser/sync/test/integration/apps_helper.cc
index 6c767ae..42e8338 100644
--- a/chrome/browser/sync/test/integration/apps_helper.cc
+++ b/chrome/browser/sync/test/integration/apps_helper.cc
@@ -212,7 +212,7 @@
void AppsMatchChecker::OnExtensionUnloaded(
content::BrowserContext* context,
const extensions::Extension* extenion,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
CheckExitCondition();
}
diff --git a/chrome/browser/sync/test/integration/apps_helper.h b/chrome/browser/sync/test/integration/apps_helper.h
index 5c0d655..be730cf 100644
--- a/chrome/browser/sync/test/integration/apps_helper.h
+++ b/chrome/browser/sync/test/integration/apps_helper.h
@@ -120,10 +120,9 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* context,
- const extensions::Extension* extenion,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* context,
+ const extensions::Extension* extenion,
+ extensions::UnloadedExtensionReason reason) override;
void OnExtensionInstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
bool is_update) override;
diff --git a/chrome/browser/sync/test/integration/extensions_helper.cc b/chrome/browser/sync/test/integration/extensions_helper.cc
index 126f96a..7c1e0f0 100644
--- a/chrome/browser/sync/test/integration/extensions_helper.cc
+++ b/chrome/browser/sync/test/integration/extensions_helper.cc
@@ -179,7 +179,7 @@
void ExtensionsMatchChecker::OnExtensionUnloaded(
content::BrowserContext* context,
const extensions::Extension* extenion,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
CheckExitCondition();
}
diff --git a/chrome/browser/sync/test/integration/extensions_helper.h b/chrome/browser/sync/test/integration/extensions_helper.h
index eabab51..d8b4e2c 100644
--- a/chrome/browser/sync/test/integration/extensions_helper.h
+++ b/chrome/browser/sync/test/integration/extensions_helper.h
@@ -101,10 +101,9 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* context,
- const extensions::Extension* extenion,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* context,
+ const extensions::Extension* extenion,
+ extensions::UnloadedExtensionReason reason) override;
void OnExtensionInstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
bool is_update) override;
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc
index 1852210..148a7bf0 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service.cc
@@ -665,8 +665,8 @@
void SyncFileSystemService::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
- if (reason != extensions::UnloadedExtensionInfo::REASON_DISABLE)
+ extensions::UnloadedExtensionReason reason) {
+ if (reason != extensions::UnloadedExtensionReason::DISABLE)
return;
GURL app_origin = Extension::GetBaseURLFromExtensionId(extension->id());
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.h b/chrome/browser/sync_file_system/sync_file_system_service.h
index cc42628..15f70d98 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.h
+++ b/chrome/browser/sync_file_system/sync_file_system_service.h
@@ -137,10 +137,9 @@
void OnExtensionInstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
bool is_update) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 425d762..3a0161e9 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -59,7 +59,6 @@
using base::UserMetricsAction;
using content::BrowserThread;
using extensions::Extension;
-using extensions::UnloadedExtensionInfo;
using ui::ResourceBundle;
@@ -195,9 +194,9 @@
void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override {
- if (reason != extensions::UnloadedExtensionInfo::REASON_UPDATE &&
- reason != extensions::UnloadedExtensionInfo::REASON_LOCK_ALL &&
+ extensions::UnloadedExtensionReason reason) override {
+ if (reason != extensions::UnloadedExtensionReason::UPDATE &&
+ reason != extensions::UnloadedExtensionReason::LOCK_ALL &&
extension->is_theme() &&
extension->id() == theme_service_->GetThemeID()) {
theme_service_->UseDefaultTheme();
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 85ecb1c2..db15e4ab 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -119,7 +119,7 @@
using base::ASCIIToUTF16;
using extensions::Extension;
using extensions::Manifest;
-using extensions::UnloadedExtensionInfo;
+using extensions::UnloadedExtensionReason;
using arc::mojom::OrientationLock;
namespace {
@@ -1680,16 +1680,16 @@
// Check that unloading of extensions works as expected.
extension_service_->UnloadExtension(extension1_->id(),
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadedExtensionReason::UNINSTALL);
EXPECT_EQ("AppList, Chrome, App3, App2", GetPinnedAppStatus());
extension_service_->UnloadExtension(extension2_->id(),
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadedExtensionReason::UNINSTALL);
EXPECT_EQ("AppList, Chrome, App3", GetPinnedAppStatus());
// Check that an update of an extension does not crash the system.
extension_service_->UnloadExtension(extension3_->id(),
- UnloadedExtensionInfo::REASON_UPDATE);
+ UnloadedExtensionReason::UPDATE);
EXPECT_EQ("AppList, Chrome, App3", GetPinnedAppStatus());
}
@@ -2759,7 +2759,7 @@
EXPECT_TRUE(launcher_controller_->IsAppPinned(extension4_->id()));
extension_service_->UnloadExtension(extension3_->id(),
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadedExtensionReason::UNINSTALL);
EXPECT_FALSE(launcher_controller_->IsAppPinned(extension3_->id()));
EXPECT_TRUE(launcher_controller_->IsAppPinned(extension4_->id()));
diff --git a/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc b/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc
index 5d3945f..06fe515 100644
--- a/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.cc
@@ -38,8 +38,8 @@
void LauncherExtensionAppUpdater::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
- if (reason == extensions::UnloadedExtensionInfo::REASON_UNINSTALL)
+ extensions::UnloadedExtensionReason reason) {
+ if (reason == extensions::UnloadedExtensionReason::UNINSTALL)
delegate()->OnAppUninstalledPrepared(browser_context, extension->id());
else
delegate()->OnAppUpdated(browser_context, extension->id());
diff --git a/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.h b/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.h
index a9588d05..1782310 100644
--- a/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.h
+++ b/chrome/browser/ui/ash/launcher/launcher_extension_app_updater.h
@@ -26,10 +26,9 @@
// ExtensionRegistryObserver:
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/ui/ash/vpn_list_forwarder.cc b/chrome/browser/ui/ash/vpn_list_forwarder.cc
index 8a4e968..9b37a81 100644
--- a/chrome/browser/ui/ash/vpn_list_forwarder.cc
+++ b/chrome/browser/ui/ash/vpn_list_forwarder.cc
@@ -80,7 +80,7 @@
void VpnListForwarder::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
if (IsVPNProvider(extension))
UpdateVPNProviders();
}
diff --git a/chrome/browser/ui/ash/vpn_list_forwarder.h b/chrome/browser/ui/ash/vpn_list_forwarder.h
index 335b571..09b305b 100644
--- a/chrome/browser/ui/ash/vpn_list_forwarder.h
+++ b/chrome/browser/ui/ash/vpn_list_forwarder.h
@@ -26,10 +26,9 @@
// extensions::ExtensionRegistryObserver:
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnShutdown(extensions::ExtensionRegistry* registry) override;
// content::NotificationObserver:
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 1ded5c36..87bda12 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2081,16 +2081,15 @@
command_controller_->ExtensionStateChanged();
}
-void Browser::OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+void Browser::OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) {
command_controller_->ExtensionStateChanged();
// Close any tabs from the unloaded extension, unless it's terminated,
// in which case let the sad tabs remain.
// Also, if tab is muted and the cause is the unloaded extension, unmute it.
- if (reason != extensions::UnloadedExtensionInfo::REASON_TERMINATE) {
+ if (reason != extensions::UnloadedExtensionReason::TERMINATE) {
// Iterate backwards as we may remove items while iterating.
for (int i = tab_strip_model_->count() - 1; i >= 0; --i) {
WebContents* web_contents = tab_strip_model_->GetWebContentsAt(i);
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 5938fef..4ceb67f 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -736,10 +736,9 @@
// Overridden from extensions::ExtensionRegistryObserver:
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
#endif
// Overridden from translate::ContentTranslateDriver::Observer:
diff --git a/chrome/browser/ui/extensions/extension_installed_bubble.cc b/chrome/browser/ui/extensions/extension_installed_bubble.cc
index c096b1f..267af8b6 100644
--- a/chrome/browser/ui/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/extensions/extension_installed_bubble.cc
@@ -95,7 +95,7 @@
void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override {
+ extensions::UnloadedExtensionReason reason) override {
if (extension == bubble_->extension()) {
// Extension is going away.
delete this;
diff --git a/chrome/browser/ui/location_bar/location_bar.cc b/chrome/browser/ui/location_bar/location_bar.cc
index 9726dcc7..4c1d05be 100644
--- a/chrome/browser/ui/location_bar/location_bar.cc
+++ b/chrome/browser/ui/location_bar/location_bar.cc
@@ -37,7 +37,7 @@
void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override {
+ extensions::UnloadedExtensionReason reason) override {
if (extensions::UIOverrides::RemovesBookmarkButton(extension))
location_bar_->UpdateBookmarkStarVisibility();
}
diff --git a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
index 9ea5488..992e89f 100644
--- a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
+++ b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc
@@ -525,8 +525,7 @@
content::NotificationService::AllSources());
// Remove the extension. Nothing should crash.
extension_service()->UnloadExtension(
- extension->id(),
- extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+ extension->id(), extensions::UnloadedExtensionReason::UNINSTALL);
observer.Wait();
}
@@ -593,7 +592,7 @@
// Remove extension 2 - there should still be one left in the overflow
// (extension 2) and one left on the main bar (extension 1).
extension_service()->UnloadExtension(
- extension3->id(), extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extension3->id(), extensions::UnloadedExtensionReason::DISABLE);
EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
EXPECT_FALSE(toolbar_actions_bar->popped_out_action());
@@ -615,7 +614,7 @@
// Remove extension 2 - the remaining two should both be overflowed.
extension_service()->UnloadExtension(
- extension2->id(), extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extension2->id(), extensions::UnloadedExtensionReason::DISABLE);
EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions());
EXPECT_FALSE(toolbar_actions_bar->popped_out_action());
@@ -632,7 +631,7 @@
EXPECT_EQ(extension3->id(),
toolbar_actions_bar->popped_out_action()->GetId());
extension_service()->UnloadExtension(
- extension3->id(), extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extension3->id(), extensions::UnloadedExtensionReason::DISABLE);
EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
EXPECT_FALSE(toolbar_actions_bar->popped_out_action());
diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
index ccca4bf..75302a2 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc
@@ -83,6 +83,6 @@
if (registry->enabled_extensions().Contains(extension_id)) {
service->UnloadExtension(
extension_id,
- extensions::UnloadedExtensionInfo::REASON_MIGRATED_TO_COMPONENT);
+ extensions::UnloadedExtensionReason::MIGRATED_TO_COMPONENT);
}
}
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.cc b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
index 8c1a63f..4350ad2 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
@@ -228,7 +228,7 @@
void ToolbarActionsModel::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
bool was_visible_and_has_overflow =
IsActionVisible(extension->id()) && !all_icons_visible();
RemoveExtension(extension);
@@ -236,7 +236,7 @@
// extensions, and this extension is being uninstalled, we reduce the visible
// count so that we don't pop out a previously-hidden extension.
if (was_visible_and_has_overflow &&
- reason == extensions::UnloadedExtensionInfo::REASON_UNINSTALL)
+ reason == extensions::UnloadedExtensionReason::UNINSTALL)
SetVisibleIconCount(visible_icon_count() - 1);
}
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.h b/chrome/browser/ui/toolbar/toolbar_actions_model.h
index 47847ab..8f01c23 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model.h
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model.h
@@ -213,10 +213,9 @@
// ExtensionRegistryObserver:
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
index 3127f70..158a2eb 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
@@ -268,7 +268,7 @@
<< " not installed!";
}
service()->UnloadExtension(extension->id(),
- extensions::UnloadedExtensionInfo::REASON_DISABLE);
+ extensions::UnloadedExtensionReason::DISABLE);
if (registry()->enabled_extensions().GetByID(extension->id())) {
return testing::AssertionFailure() << "Failed to unload extension: "
<< extension->name();
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index b6b522a..0b2364d8 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -347,7 +347,7 @@
void AppLauncherHandler::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
AppRemoved(extension, false);
}
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
index 3a52c69..e808463 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
@@ -72,10 +72,9 @@
// extensions::ExtensionRegistryObserver:
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 44bbb0bd..ca24358 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1391,7 +1391,7 @@
void BrowserOptionsHandler::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
SetupExtensionControlledIndicators();
}
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h
index b75e594..2d117952b 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.h
+++ b/chrome/browser/ui/webui/options/browser_options_handler.h
@@ -99,10 +99,9 @@
// extensions::ExtensionRegistryObserver:
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
// policy::PolicyService::Observer:
void OnPolicyUpdated(const policy::PolicyNamespace& ns,
diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc
index 5eeb8a2..f5a045c 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/font_settings_handler.cc
@@ -167,7 +167,7 @@
void FontSettingsHandler::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
NotifyAdvancedFontSettingsAvailability();
}
diff --git a/chrome/browser/ui/webui/options/font_settings_handler.h b/chrome/browser/ui/webui/options/font_settings_handler.h
index 57519f6..adcd8e8 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.h
+++ b/chrome/browser/ui/webui/options/font_settings_handler.h
@@ -43,10 +43,9 @@
// ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
private:
void HandleFetchFontsData(const base::ListValue* args);
diff --git a/chrome/browser/ui/webui/policy_ui_handler.cc b/chrome/browser/ui/webui/policy_ui_handler.cc
index b0ba068..5ea1cbb 100644
--- a/chrome/browser/ui/webui/policy_ui_handler.cc
+++ b/chrome/browser/ui/webui/policy_ui_handler.cc
@@ -609,7 +609,7 @@
void PolicyUIHandler::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
SendPolicyNames();
SendPolicyValues();
}
diff --git a/chrome/browser/ui/webui/policy_ui_handler.h b/chrome/browser/ui/webui/policy_ui_handler.h
index b8e4fa3..1201ce0 100644
--- a/chrome/browser/ui/webui/policy_ui_handler.h
+++ b/chrome/browser/ui/webui/policy_ui_handler.h
@@ -59,10 +59,9 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
#endif
// policy::PolicyService::Observer implementation.
diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc
index 4d7c4c3..954f7f66 100644
--- a/chrome/browser/ui/webui/settings/font_handler.cc
+++ b/chrome/browser/ui/webui/settings/font_handler.cc
@@ -113,10 +113,9 @@
NotifyAdvancedFontSettingsAvailability();
}
-void FontHandler::OnExtensionUnloaded(
- content::BrowserContext*,
- const extensions::Extension*,
- extensions::UnloadedExtensionInfo::Reason) {
+void FontHandler::OnExtensionUnloaded(content::BrowserContext*,
+ const extensions::Extension*,
+ extensions::UnloadedExtensionReason) {
NotifyAdvancedFontSettingsAvailability();
}
diff --git a/chrome/browser/ui/webui/settings/font_handler.h b/chrome/browser/ui/webui/settings/font_handler.h
index 320ed5b..d7c58c2 100644
--- a/chrome/browser/ui/webui/settings/font_handler.h
+++ b/chrome/browser/ui/webui/settings/font_handler.h
@@ -46,10 +46,9 @@
// ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
private:
// Handler for script asking for font information.
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index dcaf612..65e27a3 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -248,6 +248,6 @@
void UberFrameUI::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
UpdateHistoryNavigation(web_ui());
}
diff --git a/chrome/browser/ui/webui/uber/uber_ui.h b/chrome/browser/ui/webui/uber/uber_ui.h
index f0415851..b236dd072 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.h
+++ b/chrome/browser/ui/webui/uber/uber_ui.h
@@ -77,10 +77,9 @@
// extensions::ExtensionRegistryObserver implementation.
void OnExtensionLoaded(content::BrowserContext* browser_context,
const extensions::Extension* extension) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
ScopedObserver<extensions::ExtensionRegistry,
extensions::ExtensionRegistryObserver>
diff --git a/extensions/browser/api/api_resource_manager.h b/extensions/browser/api/api_resource_manager.h
index 4bbb932..1a9a8d9 100644
--- a/extensions/browser/api/api_resource_manager.h
+++ b/extensions/browser/api/api_resource_manager.h
@@ -156,7 +156,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override {
+ UnloadedExtensionReason reason) override {
data_->InitiateExtensionUnloadedCleanup(extension->id());
}
diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router.cc b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
index a105e8c..e4f52a2 100644
--- a/extensions/browser/api/bluetooth/bluetooth_event_router.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_event_router.cc
@@ -504,7 +504,7 @@
void BluetoothEventRouter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
CleanUpForExtension(extension->id());
}
diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router.h b/extensions/browser/api/bluetooth/bluetooth_event_router.h
index ed90b1a8..1f0968b 100644
--- a/extensions/browser/api/bluetooth/bluetooth_event_router.h
+++ b/extensions/browser/api/bluetooth/bluetooth_event_router.h
@@ -125,7 +125,7 @@
// Overridden from ExtensionRegistryObserver.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// BrowserContextKeyedAPI implementation.
static const char* service_name() { return "BluetoothEventRouter"; }
diff --git a/extensions/browser/api/bluetooth/bluetooth_event_router_unittest.cc b/extensions/browser/api/bluetooth/bluetooth_event_router_unittest.cc
index 533fec0..a0c8831 100644
--- a/extensions/browser/api/bluetooth/bluetooth_event_router_unittest.cc
+++ b/extensions/browser/api/bluetooth/bluetooth_event_router_unittest.cc
@@ -94,8 +94,8 @@
.SetID(kTestExtensionId)
.Build();
- ExtensionRegistry::Get(browser_context())->TriggerOnUnloaded(
- extension.get(), UnloadedExtensionInfo::REASON_DISABLE);
+ ExtensionRegistry::Get(browser_context())
+ ->TriggerOnUnloaded(extension.get(), UnloadedExtensionReason::DISABLE);
EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_)).Times(1);
}
diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc
index 5ed0354..1b62d8b 100644
--- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc
+++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.cc
@@ -1216,7 +1216,7 @@
void BluetoothLowEnergyEventRouter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
const std::string& app_id = extension->id();
const auto& services = app_id_to_service_ids_.find(app_id);
if (services == app_id_to_service_ids_.end())
diff --git a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h
index 646cdfc..f9ada69 100644
--- a/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h
+++ b/extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h
@@ -339,10 +339,9 @@
const device::BluetoothLocalGattCharacteristic* characteristic) override;
// extensions::ExtensionRegistryObserver overrides:
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
// Adds a mapping for a local characteristic ID to its service ID
void AddLocalCharacteristic(const std::string& id,
diff --git a/extensions/browser/api/declarative/rules_registry_service.cc b/extensions/browser/api/declarative/rules_registry_service.cc
index 94c572f3..b1c235c 100644
--- a/extensions/browser/api/declarative/rules_registry_service.cc
+++ b/extensions/browser/api/declarative/rules_registry_service.cc
@@ -215,7 +215,7 @@
void RulesRegistryService::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
NotifyRegistriesHelper(&RulesRegistry::OnExtensionUnloaded, extension);
}
diff --git a/extensions/browser/api/declarative/rules_registry_service.h b/extensions/browser/api/declarative/rules_registry_service.h
index c2afa8e90..df30b1d 100644
--- a/extensions/browser/api/declarative/rules_registry_service.h
+++ b/extensions/browser/api/declarative/rules_registry_service.h
@@ -107,7 +107,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/extensions/browser/api/idle/idle_api_unittest.cc b/extensions/browser/api/idle/idle_api_unittest.cc
index e5c14fa..df4668b 100644
--- a/extensions/browser/api/idle/idle_api_unittest.cc
+++ b/extensions/browser/api/idle/idle_api_unittest.cc
@@ -498,8 +498,7 @@
// Threshold will reset after unload (and listen count == 0)
ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
- registry->TriggerOnUnloaded(extension(),
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ registry->TriggerOnUnloaded(extension(), UnloadedExtensionReason::UNINSTALL);
{
ScopedListen listen(idle_manager_, extension()->id());
@@ -516,8 +515,7 @@
// Verifies that unloading an extension with no listeners or threshold works.
TEST_F(IdleTest, UnloadOnly) {
ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
- registry->TriggerOnUnloaded(extension(),
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ registry->TriggerOnUnloaded(extension(), UnloadedExtensionReason::UNINSTALL);
}
// Verifies that its ok for the unload notification to happen before all the
@@ -525,8 +523,7 @@
TEST_F(IdleTest, UnloadWhileListening) {
ScopedListen listen(idle_manager_, extension()->id());
ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
- registry->TriggerOnUnloaded(extension(),
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ registry->TriggerOnUnloaded(extension(), UnloadedExtensionReason::UNINSTALL);
}
// Verifies that re-adding a listener after a state change doesn't immediately
diff --git a/extensions/browser/api/idle/idle_manager.cc b/extensions/browser/api/idle/idle_manager.cc
index 1b1adf26..8f4621bb 100644
--- a/extensions/browser/api/idle/idle_manager.cc
+++ b/extensions/browser/api/idle/idle_manager.cc
@@ -143,7 +143,7 @@
void IdleManager::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
DCHECK(thread_checker_.CalledOnValidThread());
monitors_.erase(extension->id());
}
diff --git a/extensions/browser/api/idle/idle_manager.h b/extensions/browser/api/idle/idle_manager.h
index e4a076b..59d6195ae 100644
--- a/extensions/browser/api/idle/idle_manager.h
+++ b/extensions/browser/api/idle/idle_manager.h
@@ -83,7 +83,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// EventRouter::Observer implementation.
void OnListenerAdded(const EventListenerInfo& details) override;
diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
index 8f4df2a34..c9bf619 100644
--- a/extensions/browser/api/management/management_api.cc
+++ b/extensions/browser/api/management/management_api.cc
@@ -800,7 +800,7 @@
void ManagementEventRouter::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
BroadcastEvent(extension, events::MANAGEMENT_ON_DISABLED,
management::OnDisabled::kEventName);
}
diff --git a/extensions/browser/api/management/management_api.h b/extensions/browser/api/management/management_api.h
index e699ece8..0bbef529 100644
--- a/extensions/browser/api/management/management_api.h
+++ b/extensions/browser/api/management/management_api.h
@@ -225,7 +225,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionInstalled(content::BrowserContext* browser_context,
const Extension* extension,
bool is_update) override;
diff --git a/extensions/browser/api/networking_config/networking_config_service.cc b/extensions/browser/api/networking_config/networking_config_service.cc
index 2d3e2e8..cea9acd 100644
--- a/extensions/browser/api/networking_config/networking_config_service.cc
+++ b/extensions/browser/api/networking_config/networking_config_service.cc
@@ -68,7 +68,7 @@
void NetworkingConfigService::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
UnregisterExtension(extension->id());
}
diff --git a/extensions/browser/api/networking_config/networking_config_service.h b/extensions/browser/api/networking_config/networking_config_service.h
index dd6985f..4473dda 100644
--- a/extensions/browser/api/networking_config/networking_config_service.h
+++ b/extensions/browser/api/networking_config/networking_config_service.h
@@ -61,7 +61,7 @@
// ExtensionRegistryObserver
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Returns the extension id registered for |hex_ssid|. If no extension is
// registered for this |hex_ssid|, the function returns an empty string.
diff --git a/extensions/browser/api/power/power_api.cc b/extensions/browser/api/power/power_api.cc
index 5468932..308e390a 100644
--- a/extensions/browser/api/power/power_api.cc
+++ b/extensions/browser/api/power/power_api.cc
@@ -88,7 +88,7 @@
void PowerAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
RemoveRequest(extension->id());
UpdatePowerSaveBlocker();
}
diff --git a/extensions/browser/api/power/power_api.h b/extensions/browser/api/power/power_api.h
index 2a19027..d48cf32 100644
--- a/extensions/browser/api/power/power_api.h
+++ b/extensions/browser/api/power/power_api.h
@@ -89,7 +89,7 @@
// Overridden from extensions::ExtensionRegistryObserver.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
private:
friend class BrowserContextKeyedAPIFactory<PowerAPI>;
diff --git a/extensions/browser/api/power/power_api_unittest.cc b/extensions/browser/api/power/power_api_unittest.cc
index da6ca03..2083bfd 100644
--- a/extensions/browser/api/power/power_api_unittest.cc
+++ b/extensions/browser/api/power/power_api_unittest.cc
@@ -174,7 +174,7 @@
void UnloadExtension(const extensions::Extension* extension) {
PowerAPI::Get(browser_context())
->OnExtensionUnloaded(browser_context(), extension,
- UnloadedExtensionInfo::REASON_UNINSTALL);
+ UnloadedExtensionReason::UNINSTALL);
}
std::unique_ptr<PowerSaveBlockerStubManager> manager_;
diff --git a/extensions/browser/api/printer_provider/printer_provider_api.cc b/extensions/browser/api/printer_provider/printer_provider_api.cc
index a29a8ca7..cf7b2d4 100644
--- a/extensions/browser/api/printer_provider/printer_provider_api.cc
+++ b/extensions/browser/api/printer_provider/printer_provider_api.cc
@@ -279,7 +279,7 @@
// ExtensionRegistryObserver implementation:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Called before chrome.printerProvider.onGetPrintersRequested event is
// dispatched to an extension. It returns whether the extension is interested
@@ -716,7 +716,7 @@
void PrinterProviderAPIImpl::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
pending_get_printers_requests_.FailAllForExtension(extension->id());
auto print_it = pending_print_requests_.find(extension->id());
diff --git a/extensions/browser/api/printer_provider/printer_provider_apitest.cc b/extensions/browser/api/printer_provider/printer_provider_apitest.cc
index b53ac100..cb5eff6 100644
--- a/extensions/browser/api/printer_provider/printer_provider_apitest.cc
+++ b/extensions/browser/api/printer_provider/printer_provider_apitest.cc
@@ -325,8 +325,8 @@
return false;
extension_registry->RemoveEnabled(extension_id);
- extension_registry->TriggerOnUnloaded(
- extension, UnloadedExtensionInfo::REASON_TERMINATE);
+ extension_registry->TriggerOnUnloaded(extension,
+ UnloadedExtensionReason::TERMINATE);
return true;
}
diff --git a/extensions/browser/api/vpn_provider/vpn_service.cc b/extensions/browser/api/vpn_provider/vpn_service.cc
index b8fffefc..0c9f210 100644
--- a/extensions/browser/api/vpn_provider/vpn_service.cc
+++ b/extensions/browser/api/vpn_provider/vpn_service.cc
@@ -553,7 +553,7 @@
void VpnService::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) {
+ extensions::UnloadedExtensionReason reason) {
if (browser_context != browser_context_) {
NOTREACHED();
return;
@@ -566,8 +566,8 @@
static_cast<uint32_t>(api_vpn::VPN_CONNECTION_STATE_FAILURE),
base::Bind(base::DoNothing), base::Bind(DoNothingFailureCallback));
}
- if (reason == extensions::UnloadedExtensionInfo::REASON_DISABLE ||
- reason == extensions::UnloadedExtensionInfo::REASON_BLACKLIST) {
+ if (reason == extensions::UnloadedExtensionReason::DISABLE ||
+ reason == extensions::UnloadedExtensionReason::BLACKLIST) {
DestroyConfigurationsForExtension(extension);
}
}
diff --git a/extensions/browser/api/vpn_provider/vpn_service.h b/extensions/browser/api/vpn_provider/vpn_service.h
index 0e2f1d7..b13cd7d 100644
--- a/extensions/browser/api/vpn_provider/vpn_service.h
+++ b/extensions/browser/api/vpn_provider/vpn_service.h
@@ -103,10 +103,9 @@
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const extensions::Extension* extension,
extensions::UninstallReason reason) override;
- void OnExtensionUnloaded(
- content::BrowserContext* browser_context,
- const extensions::Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) override;
+ void OnExtensionUnloaded(content::BrowserContext* browser_context,
+ const extensions::Extension* extension,
+ extensions::UnloadedExtensionReason reason) override;
// Creates a new VPN configuration with |configuration_name| as the name and
// attaches it to the extension with id |extension_id|.
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index 96e22b8..86fe183 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -991,7 +991,7 @@
void AppWindow::OnExtensionUnloaded(BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (extension_id_ == extension->id())
native_app_window_->Close();
}
diff --git a/extensions/browser/app_window/app_window.h b/extensions/browser/app_window/app_window.h
index 73072ef..72d3090 100644
--- a/extensions/browser/app_window/app_window.h
+++ b/extensions/browser/app_window/app_window.h
@@ -451,7 +451,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// web_modal::WebContentsModalDialogManagerDelegate implementation.
void SetWebContentsBlocked(content::WebContents* web_contents,
diff --git a/extensions/browser/app_window/app_window_geometry_cache.cc b/extensions/browser/app_window/app_window_geometry_cache.cc
index 561034e..1713940 100644
--- a/extensions/browser/app_window/app_window_geometry_cache.cc
+++ b/extensions/browser/app_window/app_window_geometry_cache.cc
@@ -196,7 +196,7 @@
void AppWindowGeometryCache::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
SyncToStorage();
cache_.erase(extension->id());
}
diff --git a/extensions/browser/app_window/app_window_geometry_cache.h b/extensions/browser/app_window/app_window_geometry_cache.h
index f4547f797..3bd85d89 100644
--- a/extensions/browser/app_window/app_window_geometry_cache.h
+++ b/extensions/browser/app_window/app_window_geometry_cache.h
@@ -127,7 +127,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void LoadGeometryFromStorage(const std::string& extension_id);
void SyncToStorage();
diff --git a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
index 6afc206..17bece6 100644
--- a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
+++ b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
@@ -119,9 +119,8 @@
void AppWindowGeometryCacheTest::UnloadExtension(
const std::string& extension_id) {
scoped_refptr<Extension> extension = CreateExtension(extension_id);
- cache_->OnExtensionUnloaded(browser_context(),
- extension.get(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ cache_->OnExtensionUnloaded(browser_context(), extension.get(),
+ UnloadedExtensionReason::DISABLE);
WaitForSync();
}
diff --git a/extensions/browser/content_verifier.cc b/extensions/browser/content_verifier.cc
index 379010a8..57a158f 100644
--- a/extensions/browser/content_verifier.cc
+++ b/extensions/browser/content_verifier.cc
@@ -195,7 +195,7 @@
void ContentVerifier::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (shutdown_)
return;
content::BrowserThread::PostTask(
diff --git a/extensions/browser/content_verifier.h b/extensions/browser/content_verifier.h
index fd49855..1a41c80 100644
--- a/extensions/browser/content_verifier.h
+++ b/extensions/browser/content_verifier.h
@@ -72,7 +72,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
private:
DISALLOW_COPY_AND_ASSIGN(ContentVerifier);
diff --git a/extensions/browser/declarative_user_script_manager.cc b/extensions/browser/declarative_user_script_manager.cc
index 9443c8f..b0b8eaa 100644
--- a/extensions/browser/declarative_user_script_manager.cc
+++ b/extensions/browser/declarative_user_script_manager.cc
@@ -54,7 +54,7 @@
void DeclarativeUserScriptManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
for (const auto& val : declarative_user_script_masters_) {
DeclarativeUserScriptMaster* master = val.second.get();
if (master->host_id().id() == extension->id())
diff --git a/extensions/browser/declarative_user_script_manager.h b/extensions/browser/declarative_user_script_manager.h
index 3f962694..83c481c 100644
--- a/extensions/browser/declarative_user_script_manager.h
+++ b/extensions/browser/declarative_user_script_manager.h
@@ -44,7 +44,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Creates a DeclarativeUserScriptMaster object.
DeclarativeUserScriptMaster* CreateDeclarativeUserScriptMaster(
diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc
index 67eb463..897095c 100644
--- a/extensions/browser/event_router.cc
+++ b/extensions/browser/event_router.cc
@@ -823,7 +823,7 @@
void EventRouter::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
// Remove all registered listeners from our cache.
listeners_.RemoveListenersForExtension(extension->id());
}
diff --git a/extensions/browser/event_router.h b/extensions/browser/event_router.h
index edd8257..7e2577a 100644
--- a/extensions/browser/event_router.h
+++ b/extensions/browser/event_router.h
@@ -233,7 +233,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Returns true if the given listener map contains a event listeners for
// the given event. If |extension_id| is non-empty, we also check that that
diff --git a/extensions/browser/extension_host.cc b/extensions/browser/extension_host.cc
index 01845d2..4ec655a 100644
--- a/extensions/browser/extension_host.cc
+++ b/extensions/browser/extension_host.cc
@@ -249,7 +249,7 @@
void ExtensionHost::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
// The extension object will be deleted after this notification has been sent.
// Null it out so that dirty pointer issues don't arise in cases when multiple
// ExtensionHost objects pointing to the same Extension are present.
diff --git a/extensions/browser/extension_host.h b/extensions/browser/extension_host.h
index e40c384..fea09edc 100644
--- a/extensions/browser/extension_host.h
+++ b/extensions/browser/extension_host.h
@@ -131,7 +131,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
protected:
// Called each time this ExtensionHost completes a load finishes loading,
diff --git a/extensions/browser/extension_registry.cc b/extensions/browser/extension_registry.cc
index e7bf356..9c2bf16 100644
--- a/extensions/browser/extension_registry.cc
+++ b/extensions/browser/extension_registry.cc
@@ -62,9 +62,8 @@
observer.OnExtensionReady(browser_context_, extension);
}
-void ExtensionRegistry::TriggerOnUnloaded(
- const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+void ExtensionRegistry::TriggerOnUnloaded(const Extension* extension,
+ UnloadedExtensionReason reason) {
CHECK(extension);
DCHECK(!enabled_extensions_.Contains(extension->id()));
for (auto& observer : observers_)
diff --git a/extensions/browser/extension_registry.h b/extensions/browser/extension_registry.h
index 1100007..81bb6f5 100644
--- a/extensions/browser/extension_registry.h
+++ b/extensions/browser/extension_registry.h
@@ -98,7 +98,7 @@
// Invokes the observer method OnExtensionUnloaded(). The extension must not
// be enabled at the time of the call.
void TriggerOnUnloaded(const Extension* extension,
- UnloadedExtensionInfo::Reason reason);
+ UnloadedExtensionReason reason);
// If this is a fresh install then |is_update| is false and there must not be
// any installed extension with |extension|'s ID. If this is an update then
diff --git a/extensions/browser/extension_registry_observer.h b/extensions/browser/extension_registry_observer.h
index 2b98465..a7a9e9b 100644
--- a/extensions/browser/extension_registry_observer.h
+++ b/extensions/browser/extension_registry_observer.h
@@ -16,7 +16,6 @@
class Extension;
class ExtensionRegistry;
-struct UnloadedExtensionInfo;
// Observer for ExtensionRegistry. Exists in a separate header file to reduce
// the include file burden for typical clients of ExtensionRegistry.
@@ -40,7 +39,7 @@
// member of one of the other sets, like disabled, blacklisted or terminated.
virtual void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {}
+ UnloadedExtensionReason reason) {}
// Called when |extension| is about to be installed. |is_update| is true if
// the installation is the result of it updating, in which case |old_name| is
diff --git a/extensions/browser/extension_registry_unittest.cc b/extensions/browser/extension_registry_unittest.cc
index 995df167..fbf34c0 100644
--- a/extensions/browser/extension_registry_unittest.cc
+++ b/extensions/browser/extension_registry_unittest.cc
@@ -59,7 +59,7 @@
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override {
+ UnloadedExtensionReason reason) override {
unloaded_.push_back(extension);
}
@@ -259,8 +259,7 @@
registry.Shutdown();
registry.RemoveEnabled(extension->id());
- registry.TriggerOnUnloaded(extension.get(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ registry.TriggerOnUnloaded(extension.get(), UnloadedExtensionReason::DISABLE);
EXPECT_TRUE(observer.loaded().empty());
EXPECT_TRUE(HasSingleExtension(observer.unloaded(), extension.get()));
diff --git a/extensions/browser/extension_system.h b/extensions/browser/extension_system.h
index 64041ee9..49dc3116 100644
--- a/extensions/browser/extension_system.h
+++ b/extensions/browser/extension_system.h
@@ -109,7 +109,7 @@
// EXTENSION_UNLOADED notification have finished running.
virtual void UnregisterExtensionWithRequestContexts(
const std::string& extension_id,
- const UnloadedExtensionInfo::Reason reason) {}
+ const UnloadedExtensionReason reason) {}
// Signaled when the extension system has completed its startup tasks.
virtual const OneShotEvent& ready() const = 0;
diff --git a/extensions/browser/extension_user_script_loader.cc b/extensions/browser/extension_user_script_loader.cc
index 2fe0eca..e08e28a 100644
--- a/extensions/browser/extension_user_script_loader.cc
+++ b/extensions/browser/extension_user_script_loader.cc
@@ -236,7 +236,7 @@
void ExtensionUserScriptLoader::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
hosts_info_.erase(HostID(HostID::EXTENSIONS, extension->id()));
}
diff --git a/extensions/browser/extension_user_script_loader.h b/extensions/browser/extension_user_script_loader.h
index 05c9d184..564c75dd 100644
--- a/extensions/browser/extension_user_script_loader.h
+++ b/extensions/browser/extension_user_script_loader.h
@@ -52,7 +52,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Initiates script load when we have been waiting for the extension system
// to be ready.
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc
index 72d9b9f3..f20eab47 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc
@@ -154,7 +154,7 @@
void MimeHandlerStreamManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
auto streams = streams_by_extension_id_.find(extension->id());
if (streams == streams_by_extension_id_.end())
return;
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h
index ed090cf..4a3938a0 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h
@@ -50,7 +50,7 @@
// ExtensionRegistryObserver override.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
private:
class EmbedderObserver;
diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc
index fe21d30..9e178a3 100644
--- a/extensions/browser/image_loader_unittest.cc
+++ b/extensions/browser/image_loader_unittest.cc
@@ -160,8 +160,8 @@
EXPECT_EQ(0, image_loaded_count());
// Send out notification the extension was uninstalled.
- ExtensionRegistry::Get(browser_context())->TriggerOnUnloaded(
- extension.get(), UnloadedExtensionInfo::REASON_UNINSTALL);
+ ExtensionRegistry::Get(browser_context())
+ ->TriggerOnUnloaded(extension.get(), UnloadedExtensionReason::UNINSTALL);
// Chuck the extension, that way if anyone tries to access it we should crash
// or get valgrind errors.
diff --git a/extensions/browser/info_map.cc b/extensions/browser/info_map.cc
index f894cb5..b32ecde 100644
--- a/extensions/browser/info_map.cc
+++ b/extensions/browser/info_map.cc
@@ -73,12 +73,12 @@
}
void InfoMap::RemoveExtension(const std::string& extension_id,
- const UnloadedExtensionInfo::Reason reason) {
+ const UnloadedExtensionReason reason) {
CheckOnValidThread();
const Extension* extension = extensions_.GetByID(extension_id);
extra_data_.erase(extension_id); // we don't care about disabled extra data
- bool was_uninstalled = (reason != UnloadedExtensionInfo::REASON_DISABLE &&
- reason != UnloadedExtensionInfo::REASON_TERMINATE);
+ bool was_uninstalled = (reason != UnloadedExtensionReason::DISABLE &&
+ reason != UnloadedExtensionReason::TERMINATE);
if (extension) {
if (!was_uninstalled)
disabled_extensions_.Insert(extension);
diff --git a/extensions/browser/info_map.h b/extensions/browser/info_map.h
index c7c1ed96..e77b4b58 100644
--- a/extensions/browser/info_map.h
+++ b/extensions/browser/info_map.h
@@ -37,14 +37,14 @@
const ProcessMap& process_map() const { return process_map_; }
// Callback for when new extensions are loaded.
- void AddExtension(const extensions::Extension* extension,
+ void AddExtension(const Extension* extension,
base::Time install_time,
bool incognito_enabled,
bool notifications_disabled);
// Callback for when an extension is unloaded.
void RemoveExtension(const std::string& extension_id,
- const extensions::UnloadedExtensionInfo::Reason reason);
+ const UnloadedExtensionReason reason);
// Returns the time the extension was installed, or base::Time() if not found.
base::Time GetInstallTime(const std::string& extension_id) const;
@@ -55,7 +55,7 @@
// Returns true if the given extension can see events and data from another
// sub-profile (incognito to original profile, or vice versa).
- bool CanCrossIncognito(const extensions::Extension* extension) const;
+ bool CanCrossIncognito(const Extension* extension) const;
// Adds an entry to process_map_.
void RegisterExtensionProcess(const std::string& extension_id,
@@ -108,7 +108,7 @@
std::unique_ptr<QuotaService> quota_service_;
// Assignment of extensions to renderer processes.
- extensions::ProcessMap process_map_;
+ ProcessMap process_map_;
scoped_refptr<ContentVerifier> content_verifier_;
};
diff --git a/extensions/browser/info_map_unittest.cc b/extensions/browser/info_map_unittest.cc
index 3f4c412..331fe66 100644
--- a/extensions/browser/info_map_unittest.cc
+++ b/extensions/browser/info_map_unittest.cc
@@ -67,8 +67,8 @@
EXPECT_TRUE(weak_extension1->HasOneRef());
// Remove extension2, and the extension2 object should have the only ref.
- info_map->RemoveExtension(
- extension2->id(), extensions::UnloadedExtensionInfo::REASON_UNINSTALL);
+ info_map->RemoveExtension(extension2->id(),
+ UnloadedExtensionReason::UNINSTALL);
EXPECT_TRUE(extension2->HasOneRef());
// Delete the info map, and the extension3 object should have the only ref.
diff --git a/extensions/browser/lazy_background_task_queue.cc b/extensions/browser/lazy_background_task_queue.cc
index 7a98326..2403154 100644
--- a/extensions/browser/lazy_background_task_queue.cc
+++ b/extensions/browser/lazy_background_task_queue.cc
@@ -178,7 +178,7 @@
void LazyBackgroundTaskQueue::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
// Notify consumers that the page failed to load.
ProcessPendingTasks(NULL, browser_context, extension);
// If this extension is also running in an off-the-record context, notify that
diff --git a/extensions/browser/lazy_background_task_queue.h b/extensions/browser/lazy_background_task_queue.h
index b6c532c8..842ee0f 100644
--- a/extensions/browser/lazy_background_task_queue.h
+++ b/extensions/browser/lazy_background_task_queue.h
@@ -86,7 +86,7 @@
// ExtensionRegistryObserver interface.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Called when a lazy background page has finished loading, or has failed to
// load (host is NULL in that case). All enqueued tasks are run in order.
diff --git a/extensions/browser/mojo/keep_alive_impl.cc b/extensions/browser/mojo/keep_alive_impl.cc
index 3d40c14..d3e5883 100644
--- a/extensions/browser/mojo/keep_alive_impl.cc
+++ b/extensions/browser/mojo/keep_alive_impl.cc
@@ -38,7 +38,7 @@
void KeepAliveImpl::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (browser_context == context_ && extension == extension_)
delete this;
}
diff --git a/extensions/browser/mojo/keep_alive_impl.h b/extensions/browser/mojo/keep_alive_impl.h
index 49ec6e8..4d5deb7f 100644
--- a/extensions/browser/mojo/keep_alive_impl.h
+++ b/extensions/browser/mojo/keep_alive_impl.h
@@ -38,7 +38,7 @@
// ExtensionRegistryObserver overrides.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnShutdown(ExtensionRegistry* registry) override;
// Invoked when the mojo connection is disconnected.
diff --git a/extensions/browser/mojo/keep_alive_impl_unittest.cc b/extensions/browser/mojo/keep_alive_impl_unittest.cc
index 5373126f..da13052 100644
--- a/extensions/browser/mojo/keep_alive_impl_unittest.cc
+++ b/extensions/browser/mojo/keep_alive_impl_unittest.cc
@@ -131,11 +131,11 @@
ExtensionRegistry::Get(browser_context())
->TriggerOnUnloaded(other_extension.get(),
- UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadedExtensionReason::DISABLE);
EXPECT_EQ(1, GetKeepAliveCount());
ExtensionRegistry::Get(browser_context())
- ->TriggerOnUnloaded(extension(), UnloadedExtensionInfo::REASON_DISABLE);
+ ->TriggerOnUnloaded(extension(), UnloadedExtensionReason::DISABLE);
// When its extension is unloaded, the KeepAliveImpl should not modify the
// keep-alive count for its extension. However, ProcessManager resets its
// keep-alive count for an unloaded extension.
diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc
index 7ebfcd9..5a8ff38 100644
--- a/extensions/browser/process_manager.cc
+++ b/extensions/browser/process_manager.cc
@@ -624,10 +624,9 @@
}
}
-void ProcessManager::OnExtensionUnloaded(
- BrowserContext* browser_context,
- const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+void ProcessManager::OnExtensionUnloaded(BrowserContext* browser_context,
+ const Extension* extension,
+ UnloadedExtensionReason reason) {
ExtensionHost* host = GetBackgroundHostForExtension(extension->id());
if (host != nullptr)
CloseBackgroundHost(host);
diff --git a/extensions/browser/process_manager.h b/extensions/browser/process_manager.h
index 7d6e4223..209aff7 100644
--- a/extensions/browser/process_manager.h
+++ b/extensions/browser/process_manager.h
@@ -211,7 +211,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Extra information we keep for each extension's background page.
struct BackgroundPageData;
diff --git a/extensions/browser/runtime_data.cc b/extensions/browser/runtime_data.cc
index e96cb13..a598dca 100644
--- a/extensions/browser/runtime_data.cc
+++ b/extensions/browser/runtime_data.cc
@@ -49,7 +49,7 @@
void RuntimeData::OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
ExtensionFlagsMap::iterator iter = extension_flags_.find(extension->id());
if (iter != extension_flags_.end())
iter->second = iter->second & kPersistAcrossUnloadMask;
diff --git a/extensions/browser/runtime_data.h b/extensions/browser/runtime_data.h
index 3d263db..f220ac2 100644
--- a/extensions/browser/runtime_data.h
+++ b/extensions/browser/runtime_data.h
@@ -51,7 +51,7 @@
// ExtensionRegistryObserver overrides. Public for testing.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
private:
// Bitmasks for runtime states.
diff --git a/extensions/browser/runtime_data_unittest.cc b/extensions/browser/runtime_data_unittest.cc
index baa2a4f..948b24cb 100644
--- a/extensions/browser/runtime_data_unittest.cc
+++ b/extensions/browser/runtime_data_unittest.cc
@@ -33,7 +33,7 @@
class RuntimeDataTest : public testing::Test {
public:
- RuntimeDataTest() : registry_(NULL), runtime_data_(®istry_) {}
+ RuntimeDataTest() : registry_(nullptr), runtime_data_(®istry_) {}
~RuntimeDataTest() override {}
protected:
@@ -82,8 +82,8 @@
ASSERT_TRUE(runtime_data_.HasExtensionForTesting(extension->id()));
runtime_data_.SetBeingUpgraded(extension->id(), true);
- runtime_data_.OnExtensionUnloaded(
- NULL, extension.get(), UnloadedExtensionInfo::REASON_DISABLE);
+ runtime_data_.OnExtensionUnloaded(nullptr, extension.get(),
+ UnloadedExtensionReason::DISABLE);
EXPECT_TRUE(runtime_data_.HasExtensionForTesting(extension->id()));
EXPECT_FALSE(runtime_data_.IsBackgroundPageReady(extension.get()));
EXPECT_TRUE(runtime_data_.IsBeingUpgraded(extension->id()));
diff --git a/extensions/browser/service_worker_manager.cc b/extensions/browser/service_worker_manager.cc
index 16167d4..5b31f97f 100644
--- a/extensions/browser/service_worker_manager.cc
+++ b/extensions/browser/service_worker_manager.cc
@@ -27,7 +27,7 @@
void ServiceWorkerManager::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
content::BrowserContext::GetStoragePartitionForSite(browser_context_,
extension->url())
->GetServiceWorkerContext()
diff --git a/extensions/browser/service_worker_manager.h b/extensions/browser/service_worker_manager.h
index 2ba3ad1..420ef21a 100644
--- a/extensions/browser/service_worker_manager.h
+++ b/extensions/browser/service_worker_manager.h
@@ -24,7 +24,7 @@
// ExtensionRegistryObserver:
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
void OnExtensionUninstalled(content::BrowserContext* browser_context,
const Extension* extension,
extensions::UninstallReason reason) override;
diff --git a/extensions/browser/test_extension_registry_observer.cc b/extensions/browser/test_extension_registry_observer.cc
index ebdf1a8..d97aff7 100644
--- a/extensions/browser/test_extension_registry_observer.cc
+++ b/extensions/browser/test_extension_registry_observer.cc
@@ -99,7 +99,7 @@
void TestExtensionRegistryObserver::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
if (extension_id_.empty() || extension->id() == extension_id_)
unloaded_waiter_->OnObserved(extension);
}
diff --git a/extensions/browser/test_extension_registry_observer.h b/extensions/browser/test_extension_registry_observer.h
index 30074979..5676c04 100644
--- a/extensions/browser/test_extension_registry_observer.h
+++ b/extensions/browser/test_extension_registry_observer.h
@@ -47,7 +47,7 @@
const Extension* extension) override;
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
const Extension* Wait(std::unique_ptr<Waiter>* waiter);
diff --git a/extensions/browser/warning_service.cc b/extensions/browser/warning_service.cc
index 68422c89..c6f643b 100644
--- a/extensions/browser/warning_service.cc
+++ b/extensions/browser/warning_service.cc
@@ -124,7 +124,7 @@
void WarningService::OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) {
+ UnloadedExtensionReason reason) {
// Unloading one extension might have solved the problems of others.
// Therefore, we clear warnings of this type for all extensions.
std::set<Warning::WarningType> warning_types =
diff --git a/extensions/browser/warning_service.h b/extensions/browser/warning_service.h
index be8c9e9..8fd3b633 100644
--- a/extensions/browser/warning_service.h
+++ b/extensions/browser/warning_service.h
@@ -79,7 +79,7 @@
// ExtensionRegistryObserver implementation.
void OnExtensionUnloaded(content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) override;
+ UnloadedExtensionReason reason) override;
// Currently existing warnings.
WarningSet warnings_;
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index 2022263d..e84d39e 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -768,12 +768,6 @@
from_ephemeral(from_ephemeral),
old_name(old_name) {}
-UnloadedExtensionInfo::UnloadedExtensionInfo(
- const Extension* extension,
- UnloadedExtensionInfo::Reason reason)
- : reason(reason),
- extension(extension) {}
-
UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
const Extension* extension,
const PermissionSet& permissions,
diff --git a/extensions/common/extension.h b/extensions/common/extension.h
index 704b7dd..89e9a26 100644
--- a/extensions/common/extension.h
+++ b/extensions/common/extension.h
@@ -519,27 +519,18 @@
const std::string& old_name);
};
-struct UnloadedExtensionInfo {
- // TODO(DHNishi): Move this enum to ExtensionRegistryObserver.
- enum Reason {
- REASON_UNDEFINED, // Undefined state used to initialize variables.
- REASON_DISABLE, // Extension is being disabled.
- REASON_UPDATE, // Extension is being updated to a newer version.
- REASON_UNINSTALL, // Extension is being uninstalled.
- REASON_TERMINATE, // Extension has terminated.
- REASON_BLACKLIST, // Extension has been blacklisted.
- REASON_PROFILE_SHUTDOWN, // Profile is being shut down.
- REASON_LOCK_ALL, // All extensions for the profile are blocked.
- REASON_MIGRATED_TO_COMPONENT, // Extension is being migrated to a component
- // action.
- };
-
- Reason reason;
-
- // The extension being unloaded - this should always be non-NULL.
- const Extension* extension;
-
- UnloadedExtensionInfo(const Extension* extension, Reason reason);
+// TODO(DHNishi): Move this enum to ExtensionRegistryObserver.
+enum class UnloadedExtensionReason {
+ UNDEFINED, // Undefined state used to initialize variables.
+ DISABLE, // Extension is being disabled.
+ UPDATE, // Extension is being updated to a newer version.
+ UNINSTALL, // Extension is being uninstalled.
+ TERMINATE, // Extension has terminated.
+ BLACKLIST, // Extension has been blacklisted.
+ PROFILE_SHUTDOWN, // Profile is being shut down.
+ LOCK_ALL, // All extensions for the profile are blocked.
+ MIGRATED_TO_COMPONENT, // Extension is being migrated to a component
+ // action.
};
// The details sent for EXTENSION_PERMISSIONS_UPDATED notifications.
diff --git a/extensions/shell/browser/shell_extension_system.cc b/extensions/shell/browser/shell_extension_system.cc
index 992ab8f2..19ce4fab 100644
--- a/extensions/shell/browser/shell_extension_system.cc
+++ b/extensions/shell/browser/shell_extension_system.cc
@@ -175,8 +175,7 @@
void ShellExtensionSystem::UnregisterExtensionWithRequestContexts(
const std::string& extension_id,
- const UnloadedExtensionInfo::Reason reason) {
-}
+ const UnloadedExtensionReason reason) {}
const OneShotEvent& ShellExtensionSystem::ready() const {
return ready_;
diff --git a/extensions/shell/browser/shell_extension_system.h b/extensions/shell/browser/shell_extension_system.h
index 7b6b4441..553a49db 100644
--- a/extensions/shell/browser/shell_extension_system.h
+++ b/extensions/shell/browser/shell_extension_system.h
@@ -63,7 +63,7 @@
const base::Closure& callback) override;
void UnregisterExtensionWithRequestContexts(
const std::string& extension_id,
- const UnloadedExtensionInfo::Reason reason) override;
+ const UnloadedExtensionReason reason) override;
const OneShotEvent& ready() const override;
ContentVerifier* content_verifier() override;
std::unique_ptr<ExtensionSet> GetDependentExtensions(
diff --git a/extensions/shell/test/shell_apitest.cc b/extensions/shell/test/shell_apitest.cc
index b8b7829..4018e9f 100644
--- a/extensions/shell/test/shell_apitest.cc
+++ b/extensions/shell/test/shell_apitest.cc
@@ -56,7 +56,7 @@
ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context());
ASSERT_TRUE(registry->RemoveEnabled(app->id()));
- UnloadedExtensionInfo::Reason reason(UnloadedExtensionInfo::REASON_DISABLE);
+ UnloadedExtensionReason reason(UnloadedExtensionReason::DISABLE);
registry->TriggerOnUnloaded(app, reason);
content::NotificationService::current()->Notify(
