mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: move media/net from brightray to atom (#15288)

Browse source
This commit is contained in:
Milan Burda 2018-10-19 20:51:43 +02:00 • committed by John Kleinschmidt
parent 6f3c46cc7e
commit 6d844a0b67
32 changed files with 108 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/web_contents_permission_helper.cc
View file

@ -9,8 +9,8 @@
#include <utility>
#include "atom/browser/atom_permission_manager.h"
#include "atom/browser/media/media_stream_devices_controller.h"
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "brightray/browser/media/media_stream_devices_controller.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/render_process_host.h"
@ -38,8 +38,7 @@ namespace {
void MediaAccessAllowed(const content::MediaStreamRequest& request,
content::MediaResponseCallback callback,
bool allowed) {
brightray::MediaStreamDevicesController controller(request,
std::move(callback));
MediaStreamDevicesController controller(request, std::move(callback));
if (allowed)
controller.TakeAction();
else