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

Side by Side Diff: content/browser/renderer_host/media/media_devices_dispatcher_host.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "content/browser/renderer_host/media/media_devices_dispatcher_host.h" 5 #include "content/browser/renderer_host/media/media_devices_dispatcher_host.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "content/browser/bad_message.h" 12 #include "content/browser/bad_message.h"
13 #include "content/browser/renderer_host/media/media_stream_manager.h" 13 #include "content/browser/renderer_host/media/media_stream_manager.h"
14 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" 14 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
15 #include "content/common/media/media_devices.h" 15 #include "content/common/media/media_devices.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #include "content/public/browser/media_device_id.h" 17 #include "content/public/browser/media_device_id.h"
18 #include "content/public/browser/render_frame_host.h" 18 #include "content/public/browser/render_frame_host.h"
19 #include "content/public/browser/resource_context.h" 19 #include "content/public/browser/resource_context.h"
20 #include "content/public/common/media_stream_request.h" 20 #include "content/public/common/media_stream_request.h"
21 #include "mojo/public/cpp/bindings/strong_binding.h" 21 #include "mojo/public/cpp/bindings/strong_binding.h"
22 #include "services/shell/public/cpp/interface_provider.h" 22 #include "services/service_manager/public/cpp/interface_provider.h"
23 #include "url/origin.h" 23 #include "url/origin.h"
24 24
25 namespace content { 25 namespace content {
26 26
27 namespace { 27 namespace {
28 28
29 MediaDeviceInfo TranslateDeviceInfo(bool has_permission, 29 MediaDeviceInfo TranslateDeviceInfo(bool has_permission,
30 const std::string& device_id_salt, 30 const std::string& device_id_salt,
31 const std::string& group_id_salt, 31 const std::string& group_id_salt,
32 const url::Origin& security_origin, 32 const url::Origin& security_origin,
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 217 }
218 218
219 void MediaDevicesDispatcherHost::SetFakeUIProxyForTesting( 219 void MediaDevicesDispatcherHost::SetFakeUIProxyForTesting(
220 std::unique_ptr<MediaStreamUIProxy> fake_ui_proxy) { 220 std::unique_ptr<MediaStreamUIProxy> fake_ui_proxy) {
221 DCHECK_CURRENTLY_ON(BrowserThread::IO); 221 DCHECK_CURRENTLY_ON(BrowserThread::IO);
222 if (use_fake_ui_) 222 if (use_fake_ui_)
223 fake_ui_proxy_ = std::move(fake_ui_proxy); 223 fake_ui_proxy_ = std::move(fake_ui_proxy);
224 } 224 }
225 225
226 } // namespace content 226 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/mojo_sandbox_browsertest.cc ('k') | content/browser/renderer_host/render_process_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698