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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 linked_ptr<mdns::MDnsService> mdns_service = | 138 linked_ptr<mdns::MDnsService> mdns_service = |
139 make_linked_ptr(new mdns::MDnsService); | 139 make_linked_ptr(new mdns::MDnsService); |
140 mdns_service->service_name = (*it).service_name; | 140 mdns_service->service_name = (*it).service_name; |
141 mdns_service->service_host_port = (*it).service_host_port; | 141 mdns_service->service_host_port = (*it).service_host_port; |
142 mdns_service->ip_address = (*it).ip_address; | 142 mdns_service->ip_address = (*it).ip_address; |
143 mdns_service->service_data = (*it).service_data; | 143 mdns_service->service_data = (*it).service_data; |
144 args.push_back(mdns_service); | 144 args.push_back(mdns_service); |
145 } | 145 } |
146 | 146 |
147 scoped_ptr<base::ListValue> results = mdns::OnServiceList::Create(args); | 147 scoped_ptr<base::ListValue> results = mdns::OnServiceList::Create(args); |
148 scoped_ptr<Event> event( | 148 scoped_ptr<Event> event(new Event( |
149 new Event(mdns::OnServiceList::kEventName, results.Pass())); | 149 events::UNKNOWN, mdns::OnServiceList::kEventName, results.Pass())); |
150 event->restrict_to_browser_context = browser_context_; | 150 event->restrict_to_browser_context = browser_context_; |
151 event->filter_info.SetServiceType(service_type); | 151 event->filter_info.SetServiceType(service_type); |
152 | 152 |
153 // TODO(justinlin): To avoid having listeners without filters getting all | 153 // TODO(justinlin): To avoid having listeners without filters getting all |
154 // events, modify API to have this event require filters. | 154 // events, modify API to have this event require filters. |
155 // TODO(reddaly): If event isn't on whitelist, ensure it does not get | 155 // TODO(reddaly): If event isn't on whitelist, ensure it does not get |
156 // broadcast to extensions. | 156 // broadcast to extensions. |
157 extensions::EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass()); | 157 extensions::EventRouter::Get(browser_context_)->BroadcastEvent(event.Pass()); |
158 } | 158 } |
159 | 159 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 if (!rvh) | 217 if (!rvh) |
218 continue; | 218 continue; |
219 rvh->Send(new ExtensionMsg_AddMessageToConsole( | 219 rvh->Send(new ExtensionMsg_AddMessageToConsole( |
220 rvh->GetRoutingID(), | 220 rvh->GetRoutingID(), |
221 level, | 221 level, |
222 logged_message)); | 222 logged_message)); |
223 } | 223 } |
224 } | 224 } |
225 | 225 |
226 } // namespace extensions | 226 } // namespace extensions |
OLD | NEW |