| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat
e_api.h" | 5 #include "chrome/browser/extensions/api/activity_log_private/activity_log_privat
e_api.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 void ActivityLogAPI::OnListenerAdded(const EventListenerInfo& details) { | 81 void ActivityLogAPI::OnListenerAdded(const EventListenerInfo& details) { |
| 82 // TODO(felt): Only observe activity_log_ events when we have a customer. | 82 // TODO(felt): Only observe activity_log_ events when we have a customer. |
| 83 } | 83 } |
| 84 | 84 |
| 85 void ActivityLogAPI::OnListenerRemoved(const EventListenerInfo& details) { | 85 void ActivityLogAPI::OnListenerRemoved(const EventListenerInfo& details) { |
| 86 // TODO(felt): Only observe activity_log_ events when we have a customer. | 86 // TODO(felt): Only observe activity_log_ events when we have a customer. |
| 87 } | 87 } |
| 88 | 88 |
| 89 void ActivityLogAPI::OnExtensionActivity(scoped_refptr<Action> activity) { | 89 void ActivityLogAPI::OnExtensionActivity(scoped_refptr<Action> activity) { |
| 90 scoped_ptr<base::ListValue> value(new base::ListValue()); | 90 scoped_ptr<base::ListValue> value(new base::ListValue()); |
| 91 scoped_ptr<ExtensionActivity> activity_arg = | 91 ExtensionActivity activity_arg = activity->ConvertToExtensionActivity(); |
| 92 activity->ConvertToExtensionActivity(); | 92 value->Append(activity_arg.ToValue()); |
| 93 value->Append(activity_arg->ToValue().release()); | |
| 94 scoped_ptr<Event> event(new Event( | 93 scoped_ptr<Event> event(new Event( |
| 95 events::ACTIVITY_LOG_PRIVATE_ON_EXTENSION_ACTIVITY, | 94 events::ACTIVITY_LOG_PRIVATE_ON_EXTENSION_ACTIVITY, |
| 96 activity_log_private::OnExtensionActivity::kEventName, std::move(value))); | 95 activity_log_private::OnExtensionActivity::kEventName, std::move(value))); |
| 97 event->restrict_to_browser_context = browser_context_; | 96 event->restrict_to_browser_context = browser_context_; |
| 98 EventRouter::Get(browser_context_)->BroadcastEvent(std::move(event)); | 97 EventRouter::Get(browser_context_)->BroadcastEvent(std::move(event)); |
| 99 } | 98 } |
| 100 | 99 |
| 101 bool ActivityLogPrivateGetExtensionActivitiesFunction::RunAsync() { | 100 bool ActivityLogPrivateGetExtensionActivitiesFunction::RunAsync() { |
| 102 scoped_ptr<activity_log_private::GetExtensionActivities::Params> params( | 101 scoped_ptr<activity_log_private::GetExtensionActivities::Params> params( |
| 103 activity_log_private::GetExtensionActivities::Params::Create(*args_)); | 102 activity_log_private::GetExtensionActivities::Params::Create(*args_)); |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 base::Bind( | 154 base::Bind( |
| 156 &ActivityLogPrivateGetExtensionActivitiesFunction::OnLookupCompleted, | 155 &ActivityLogPrivateGetExtensionActivitiesFunction::OnLookupCompleted, |
| 157 this)); | 156 this)); |
| 158 | 157 |
| 159 return true; | 158 return true; |
| 160 } | 159 } |
| 161 | 160 |
| 162 void ActivityLogPrivateGetExtensionActivitiesFunction::OnLookupCompleted( | 161 void ActivityLogPrivateGetExtensionActivitiesFunction::OnLookupCompleted( |
| 163 scoped_ptr<std::vector<scoped_refptr<Action> > > activities) { | 162 scoped_ptr<std::vector<scoped_refptr<Action> > > activities) { |
| 164 // Convert Actions to ExtensionActivities. | 163 // Convert Actions to ExtensionActivities. |
| 165 std::vector<linked_ptr<ExtensionActivity> > result_arr; | 164 std::vector<ExtensionActivity> result_arr; |
| 166 for (std::vector<scoped_refptr<Action> >::iterator it = activities->begin(); | 165 for (const auto& activity : *activities) |
| 167 it != activities->end(); | 166 result_arr.push_back(activity->ConvertToExtensionActivity()); |
| 168 ++it) { | |
| 169 result_arr.push_back( | |
| 170 make_linked_ptr(it->get()->ConvertToExtensionActivity().release())); | |
| 171 } | |
| 172 | 167 |
| 173 // Populate the return object. | 168 // Populate the return object. |
| 174 scoped_ptr<ActivityResultSet> result_set(new ActivityResultSet); | 169 scoped_ptr<ActivityResultSet> result_set(new ActivityResultSet); |
| 175 result_set->activities = result_arr; | 170 result_set->activities = std::move(result_arr); |
| 176 results_ = activity_log_private::GetExtensionActivities::Results::Create( | 171 results_ = activity_log_private::GetExtensionActivities::Results::Create( |
| 177 *result_set); | 172 *result_set); |
| 178 | 173 |
| 179 SendResponse(true); | 174 SendResponse(true); |
| 180 } | 175 } |
| 181 | 176 |
| 182 bool ActivityLogPrivateDeleteActivitiesFunction::RunAsync() { | 177 bool ActivityLogPrivateDeleteActivitiesFunction::RunAsync() { |
| 183 scoped_ptr<activity_log_private::DeleteActivities::Params> params( | 178 scoped_ptr<activity_log_private::DeleteActivities::Params> params( |
| 184 activity_log_private::DeleteActivities::Params::Create(*args_)); | 179 activity_log_private::DeleteActivities::Params::Create(*args_)); |
| 185 EXTENSION_FUNCTION_VALIDATE(params.get()); | 180 EXTENSION_FUNCTION_VALIDATE(params.get()); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 gurls.push_back(GURL(*it)); | 214 gurls.push_back(GURL(*it)); |
| 220 } | 215 } |
| 221 | 216 |
| 222 ActivityLog* activity_log = ActivityLog::GetInstance(GetProfile()); | 217 ActivityLog* activity_log = ActivityLog::GetInstance(GetProfile()); |
| 223 DCHECK(activity_log); | 218 DCHECK(activity_log); |
| 224 activity_log->RemoveURLs(gurls); | 219 activity_log->RemoveURLs(gurls); |
| 225 return true; | 220 return true; |
| 226 } | 221 } |
| 227 | 222 |
| 228 } // namespace extensions | 223 } // namespace extensions |
| OLD | NEW |