diff options
Diffstat (limited to 'chrome/browser/extensions/api/management/management_api.cc')
-rw-r--r-- | chrome/browser/extensions/api/management/management_api.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 1debb52..eb776d1 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -20,7 +20,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/management/management_api_constants.h" -#include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" @@ -60,7 +59,6 @@ namespace keys = extension_management_api_constants; namespace extensions { -namespace events = event_names; namespace management = api::management; namespace { @@ -652,20 +650,20 @@ void ManagementEventRouter::Observe( switch (type) { case chrome::NOTIFICATION_EXTENSION_INSTALLED: - event_name = events::kOnExtensionInstalled; + event_name = management::OnInstalled::kEventName; extension = content::Details<const InstalledExtensionInfo>(details)->extension; break; case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: - event_name = events::kOnExtensionUninstalled; + event_name = management::OnUninstalled::kEventName; extension = content::Details<const Extension>(details).ptr(); break; case chrome::NOTIFICATION_EXTENSION_LOADED: - event_name = events::kOnExtensionEnabled; + event_name = management::OnEnabled::kEventName; extension = content::Details<const Extension>(details).ptr(); break; case chrome::NOTIFICATION_EXTENSION_UNLOADED: - event_name = events::kOnExtensionDisabled; + event_name = management::OnDisabled::kEventName; extension = content::Details<const UnloadedExtensionInfo>(details)->extension; break; @@ -680,7 +678,7 @@ void ManagementEventRouter::Observe( return; // Don't dispatch events for built-in extensions. scoped_ptr<base::ListValue> args(new base::ListValue()); - if (event_name == events::kOnExtensionUninstalled) { + if (event_name == management::OnUninstalled::kEventName) { args->Append(new base::StringValue(extension->id())); } else { scoped_ptr<management::ExtensionInfo> info = CreateExtensionInfo( @@ -695,13 +693,13 @@ void ManagementEventRouter::Observe( ManagementAPI::ManagementAPI(Profile* profile) : profile_(profile) { ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( - this, events::kOnExtensionInstalled); + this, management::OnInstalled::kEventName); ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( - this, events::kOnExtensionUninstalled); + this, management::OnUninstalled::kEventName); ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( - this, events::kOnExtensionEnabled); + this, management::OnEnabled::kEventName); ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( - this, events::kOnExtensionDisabled); + this, management::OnDisabled::kEventName); } ManagementAPI::~ManagementAPI() { |