Index: chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc |
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc |
index bb6fa76a6a2e343dec018d37d132523ebc6fdf32..691825d5f0bd9b69e38a1ece374a61172af14d76 100644 |
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc |
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc |
@@ -22,9 +22,9 @@ namespace extensions { |
namespace activity_log_private = api::activity_log_private; |
-using api::activity_log_private::ActivityResultSet; |
-using api::activity_log_private::ExtensionActivity; |
-using api::activity_log_private::Filter; |
+using activity_log_private::ActivityResultSet; |
+using activity_log_private::ExtensionActivity; |
+using activity_log_private::Filter; |
static base::LazyInstance<BrowserContextKeyedAPIFactory<ActivityLogAPI> > |
g_factory = LAZY_INSTANCE_INITIALIZER; |
@@ -104,25 +104,25 @@ bool ActivityLogPrivateGetExtensionActivitiesFunction::RunAsync() { |
filter.reset(¶ms.release()->filter); |
Action::ActionType action_type = Action::ACTION_API_CALL; |
switch (filter->activity_type) { |
- case Filter::ACTIVITY_TYPE_API_CALL: |
+ case activity_log_private::EXTENSION_ACTIVITY_FILTER_API_CALL: |
action_type = Action::ACTION_API_CALL; |
break; |
- case Filter::ACTIVITY_TYPE_API_EVENT: |
+ case activity_log_private::EXTENSION_ACTIVITY_FILTER_API_EVENT: |
action_type = Action::ACTION_API_EVENT; |
break; |
- case Filter::ACTIVITY_TYPE_CONTENT_SCRIPT: |
+ case activity_log_private::EXTENSION_ACTIVITY_FILTER_CONTENT_SCRIPT: |
action_type = Action::ACTION_CONTENT_SCRIPT; |
break; |
- case Filter::ACTIVITY_TYPE_DOM_ACCESS: |
+ case activity_log_private::EXTENSION_ACTIVITY_FILTER_DOM_ACCESS: |
action_type = Action::ACTION_DOM_ACCESS; |
break; |
- case Filter::ACTIVITY_TYPE_DOM_EVENT: |
+ case activity_log_private::EXTENSION_ACTIVITY_FILTER_DOM_EVENT: |
action_type = Action::ACTION_DOM_EVENT; |
break; |
- case Filter::ACTIVITY_TYPE_WEB_REQUEST: |
+ case activity_log_private::EXTENSION_ACTIVITY_FILTER_WEB_REQUEST: |
action_type = Action::ACTION_WEB_REQUEST; |
break; |
- case Filter::ACTIVITY_TYPE_ANY: |
+ case activity_log_private::EXTENSION_ACTIVITY_FILTER_ANY: |
default: |
action_type = Action::ACTION_ANY; |
} |