| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/media/extension_media_access_handler.h" | 5 #include "chrome/browser/media/extension_media_access_handler.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 9 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 8 #include "chrome/browser/media/media_stream_capture_indicator.h" | 10 #include "chrome/browser/media/media_stream_capture_indicator.h" |
| 9 #include "chrome/browser/media/media_stream_device_permissions.h" | 11 #include "chrome/browser/media/media_stream_device_permissions.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 12 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
| 13 #include "extensions/common/extension.h" | 15 #include "extensions/common/extension.h" |
| 14 #include "extensions/common/permissions/permissions_data.h" | 16 #include "extensions/common/permissions/permissions_data.h" |
| 15 | 17 |
| 16 namespace { | 18 namespace { |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 } | 138 } |
| 137 | 139 |
| 138 scoped_ptr<content::MediaStreamUI> ui; | 140 scoped_ptr<content::MediaStreamUI> ui; |
| 139 if (!devices.empty()) { | 141 if (!devices.empty()) { |
| 140 result = content::MEDIA_DEVICE_OK; | 142 result = content::MEDIA_DEVICE_OK; |
| 141 ui = MediaCaptureDevicesDispatcher::GetInstance() | 143 ui = MediaCaptureDevicesDispatcher::GetInstance() |
| 142 ->GetMediaStreamCaptureIndicator() | 144 ->GetMediaStreamCaptureIndicator() |
| 143 ->RegisterMediaStream(web_contents, devices); | 145 ->RegisterMediaStream(web_contents, devices); |
| 144 } | 146 } |
| 145 | 147 |
| 146 callback.Run(devices, result, ui.Pass()); | 148 callback.Run(devices, result, std::move(ui)); |
| 147 } | 149 } |
| OLD | NEW |