Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(534)

Side by Side Diff: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/webrtc_audio_private/webrtc_audio_privat e_api.h" 5 #include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_privat e_api.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/task_runner_util.h" 9 #include "base/task_runner_util.h"
10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" 10 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/extensions/extension_tab_util.h" 11 #include "chrome/browser/extensions/extension_tab_util.h"
13 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
14 #include "content/public/browser/media_device_id.h" 13 #include "content/public/browser/media_device_id.h"
15 #include "content/public/browser/resource_context.h" 14 #include "content/public/browser/resource_context.h"
16 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
17 #include "extensions/browser/event_router.h" 16 #include "extensions/browser/event_router.h"
18 #include "extensions/browser/extension_system.h" 17 #include "extensions/browser/extension_registry.h"
19 #include "extensions/common/error_utils.h" 18 #include "extensions/common/error_utils.h"
20 #include "extensions/common/permissions/permissions_data.h" 19 #include "extensions/common/permissions/permissions_data.h"
21 #include "media/audio/audio_manager_base.h" 20 #include "media/audio/audio_manager_base.h"
22 #include "media/audio/audio_output_controller.h" 21 #include "media/audio/audio_output_controller.h"
23 22
24 namespace extensions { 23 namespace extensions {
25 24
26 using content::BrowserThread; 25 using content::BrowserThread;
27 using content::RenderViewHost; 26 using content::RenderViewHost;
28 using media::AudioDeviceNames; 27 using media::AudioDeviceNames;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 break; 76 break;
78 } 77 }
79 } 78 }
80 79
81 void WebrtcAudioPrivateEventService::SignalEvent() { 80 void WebrtcAudioPrivateEventService::SignalEvent() {
82 using api::webrtc_audio_private::OnSinksChanged::kEventName; 81 using api::webrtc_audio_private::OnSinksChanged::kEventName;
83 82
84 EventRouter* router = EventRouter::Get(browser_context_); 83 EventRouter* router = EventRouter::Get(browser_context_);
85 if (!router || !router->HasEventListener(kEventName)) 84 if (!router || !router->HasEventListener(kEventName))
86 return; 85 return;
87 ExtensionService* extension_service = 86
88 ExtensionSystem::Get(browser_context_)->extension_service(); 87 for (const scoped_refptr<const extensions::Extension>& extension :
89 const ExtensionSet* extensions = extension_service->extensions(); 88 ExtensionRegistry::Get(browser_context_)->enabled_extensions()) {
90 for (ExtensionSet::const_iterator it = extensions->begin(); 89 const std::string& extension_id = extension->id();
91 it != extensions->end(); ++it) {
92 const std::string& extension_id = (*it)->id();
93 if (router->ExtensionHasEventListener(extension_id, kEventName) && 90 if (router->ExtensionHasEventListener(extension_id, kEventName) &&
94 (*it)->permissions_data()->HasAPIPermission("webrtcAudioPrivate")) { 91 extension->permissions_data()->HasAPIPermission("webrtcAudioPrivate")) {
95 scoped_ptr<Event> event( 92 scoped_ptr<Event> event(
96 new Event(kEventName, make_scoped_ptr(new base::ListValue()).Pass())); 93 new Event(kEventName, make_scoped_ptr(new base::ListValue()).Pass()));
97 router->DispatchEventToExtension(extension_id, event.Pass()); 94 router->DispatchEventToExtension(extension_id, event.Pass());
98 } 95 }
99 } 96 }
100 } 97 }
101 98
102 WebrtcAudioPrivateFunction::WebrtcAudioPrivateFunction() 99 WebrtcAudioPrivateFunction::WebrtcAudioPrivateFunction()
103 : resource_context_(NULL) { 100 : resource_context_(NULL) {
104 } 101 }
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 results_.reset(wap::GetAssociatedSink::Results::Create("").release()); 473 results_.reset(wap::GetAssociatedSink::Results::Create("").release());
477 } else { 474 } else {
478 results_.reset( 475 results_.reset(
479 wap::GetAssociatedSink::Results::Create(associated_sink_id).release()); 476 wap::GetAssociatedSink::Results::Create(associated_sink_id).release());
480 } 477 }
481 478
482 SendResponse(true); 479 SendResponse(true);
483 } 480 }
484 481
485 } // namespace extensions 482 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698