| 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/mdns/mdns_api.h" | 5 #include "chrome/browser/extensions/api/mdns/mdns_api.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 } | 167 } |
| 168 mdns::MDnsService mdns_service; | 168 mdns::MDnsService mdns_service; |
| 169 mdns_service.service_name = service.service_name; | 169 mdns_service.service_name = service.service_name; |
| 170 mdns_service.service_host_port = service.service_host_port; | 170 mdns_service.service_host_port = service.service_host_port; |
| 171 mdns_service.ip_address = service.ip_address; | 171 mdns_service.ip_address = service.ip_address; |
| 172 mdns_service.service_data = service.service_data; | 172 mdns_service.service_data = service.service_data; |
| 173 args.push_back(std::move(mdns_service)); | 173 args.push_back(std::move(mdns_service)); |
| 174 } | 174 } |
| 175 | 175 |
| 176 std::unique_ptr<base::ListValue> results = mdns::OnServiceList::Create(args); | 176 std::unique_ptr<base::ListValue> results = mdns::OnServiceList::Create(args); |
| 177 std::unique_ptr<Event> event(new Event(events::MDNS_ON_SERVICE_LIST, | 177 auto event = base::MakeUnique<Event>(events::MDNS_ON_SERVICE_LIST, |
| 178 mdns::OnServiceList::kEventName, | 178 mdns::OnServiceList::kEventName, |
| 179 std::move(results))); | 179 std::move(results), browser_context_); |
| 180 event->restrict_to_browser_context = browser_context_; | |
| 181 event->filter_info.SetServiceType(service_type); | 180 event->filter_info.SetServiceType(service_type); |
| 182 | 181 |
| 183 // TODO(justinlin): To avoid having listeners without filters getting all | 182 // TODO(justinlin): To avoid having listeners without filters getting all |
| 184 // events, modify API to have this event require filters. | 183 // events, modify API to have this event require filters. |
| 185 // TODO(reddaly): If event isn't on whitelist, ensure it does not get | 184 // TODO(reddaly): If event isn't on whitelist, ensure it does not get |
| 186 // broadcast to extensions. | 185 // broadcast to extensions. |
| 187 extensions::EventRouter::Get(browser_context_) | 186 extensions::EventRouter::Get(browser_context_) |
| 188 ->BroadcastEvent(std::move(event)); | 187 ->BroadcastEvent(std::move(event)); |
| 189 } | 188 } |
| 190 | 189 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 AsyncApiFunction::ResponseAction MdnsForceDiscoveryFunction::Run() { | 268 AsyncApiFunction::ResponseAction MdnsForceDiscoveryFunction::Run() { |
| 270 MDnsAPI* api = MDnsAPI::Get(browser_context()); | 269 MDnsAPI* api = MDnsAPI::Get(browser_context()); |
| 271 if (!api) { | 270 if (!api) { |
| 272 return RespondNow(Error("Unknown error.")); | 271 return RespondNow(Error("Unknown error.")); |
| 273 } | 272 } |
| 274 api->ForceDiscovery(); | 273 api->ForceDiscovery(); |
| 275 return RespondNow(NoArguments()); | 274 return RespondNow(NoArguments()); |
| 276 } | 275 } |
| 277 | 276 |
| 278 } // namespace extensions | 277 } // namespace extensions |
| OLD | NEW |