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

4
browser/native_window.h
View file

@ -138,10 +138,6 @@ class NativeWindow : public content::WebContentsDelegate,
virtual void RequestToLockMouse(content::WebContents* web_contents,
bool user_gesture,
bool last_unlocked_by_target) OVERRIDE;
virtual void RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) OVERRIDE;
virtual bool CanOverscrollContent() const OVERRIDE;
virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;