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

Revert "Enable getUserMedia(). Part of fixes for #31."

Browse source 
Now the getUserMedia is implemented in brightray.

This reverts commit f26db5c7a1.

Conflicts:
	atom.gyp
This commit is contained in:
Cheng Zhao 2013-08-01 14:50:06 +08:00
parent 51cf1db652
commit d888f5cc31
10 changed files with 1 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

9
browser/native_window.cc
View file

@ -15,7 +15,6 @@
#include "browser/atom_browser_context.h"
#include "browser/atom_browser_main_parts.h"
#include "browser/atom_javascript_dialog_manager.h"
#include "browser/media/media_stream_devices_controller.h"
#include "browser/window_list.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/invalidate_type.h"
@ -234,14 +233,6 @@ void NativeWindow::RequestToLockMouse(content::WebContents* web_contents,
GetWebContents()->GotResponseToLockMouseRequest(true);
}
void NativeWindow::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) {
MediaStreamDevicesController controller(request, callback);
controller.TakeAction();
}
bool NativeWindow::CanOverscrollContent() const {
return false;
}