Index: chrome/browser/extensions/api/management/management_api.cc |
diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc |
index b788c99ded8408de572297257cd2c38c947dec1b..0a479e014c4f8145573a35e5236d05c7bbdec1a4 100644 |
--- a/chrome/browser/extensions/api/management/management_api.cc |
+++ b/chrome/browser/extensions/api/management/management_api.cc |
@@ -57,7 +57,6 @@ namespace keys = extension_management_api_constants; |
namespace extensions { |
-namespace events = event_names; |
namespace management = api::management; |
namespace { |
@@ -649,16 +648,16 @@ void ManagementEventRouter::Observe( |
switch (type) { |
case chrome::NOTIFICATION_EXTENSION_INSTALLED: |
- event_name = events::kOnExtensionInstalled; |
+ event_name = event_names::kOnExtensionInstalled; |
break; |
case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: |
- event_name = events::kOnExtensionUninstalled; |
+ event_name = event_names::kOnExtensionUninstalled; |
break; |
case chrome::NOTIFICATION_EXTENSION_LOADED: |
- event_name = events::kOnExtensionEnabled; |
+ event_name = event_names::kOnExtensionEnabled; |
break; |
case chrome::NOTIFICATION_EXTENSION_UNLOADED: |
- event_name = events::kOnExtensionDisabled; |
+ event_name = event_names::kOnExtensionDisabled; |
break; |
default: |
NOTREACHED(); |
@@ -666,12 +665,12 @@ void ManagementEventRouter::Observe( |
} |
scoped_ptr<ListValue> args(new ListValue()); |
- if (event_name == events::kOnExtensionUninstalled) { |
+ if (event_name == event_names::kOnExtensionUninstalled) { |
args->Append(Value::CreateStringValue( |
content::Details<const Extension>(details).ptr()->id())); |
} else { |
const Extension* extension = NULL; |
- if (event_name == events::kOnExtensionDisabled) { |
+ if (event_name == event_names::kOnExtensionDisabled) { |
extension = content::Details<UnloadedExtensionInfo>(details)->extension; |
} else { |
extension = content::Details<const Extension>(details).ptr(); |
@@ -689,13 +688,13 @@ void ManagementEventRouter::Observe( |
ManagementAPI::ManagementAPI(Profile* profile) |
: profile_(profile) { |
ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( |
- this, events::kOnExtensionInstalled); |
+ this, event_names::kOnExtensionInstalled); |
ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( |
- this, events::kOnExtensionUninstalled); |
+ this, event_names::kOnExtensionUninstalled); |
ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( |
- this, events::kOnExtensionEnabled); |
+ this, event_names::kOnExtensionEnabled); |
ExtensionSystem::Get(profile_)->event_router()->RegisterObserver( |
- this, events::kOnExtensionDisabled); |
+ this, event_names::kOnExtensionDisabled); |
} |
ManagementAPI::~ManagementAPI() { |