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

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

Issue 148083014: ExtensionSystem cleanup part 3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac Created 6 years, 10 months 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 | Annotate | Revision Log
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" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/extensions/extension_tab_util.h" 12 #include "chrome/browser/extensions/extension_tab_util.h"
13 #include "content/public/browser/media_device_id.h" 13 #include "content/public/browser/media_device_id.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "extensions/browser/event_router.h" 15 #include "extensions/browser/event_router.h"
16 #include "extensions/browser/extension_system.h"
16 #include "extensions/common/error_utils.h" 17 #include "extensions/common/error_utils.h"
17 #include "media/audio/audio_manager_base.h" 18 #include "media/audio/audio_manager_base.h"
18 #include "media/audio/audio_output_controller.h" 19 #include "media/audio/audio_output_controller.h"
19 20
20 namespace extensions { 21 namespace extensions {
21 22
22 using content::BrowserThread; 23 using content::BrowserThread;
23 using content::RenderViewHost; 24 using content::RenderViewHost;
24 using media::AudioDeviceNames; 25 using media::AudioDeviceNames;
25 using media::AudioManager; 26 using media::AudioManager;
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 results_.reset(wap::GetAssociatedSink::Results::Create("").release()); 473 results_.reset(wap::GetAssociatedSink::Results::Create("").release());
473 } else { 474 } else {
474 results_.reset( 475 results_.reset(
475 wap::GetAssociatedSink::Results::Create(associated_sink_id).release()); 476 wap::GetAssociatedSink::Results::Create(associated_sink_id).release());
476 } 477 }
477 478
478 SendResponse(true); 479 SendResponse(true);
479 } 480 }
480 481
481 } // namespace extensions 482 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698