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

5
browser/atom_browser_client.cc
View file

@ -5,7 +5,6 @@
#include "browser/atom_browser_client.h"
#include "browser/atom_browser_main_parts.h"
#include "browser/media/media_capture_devices_dispatcher.h"
#include "webkit/glue/webpreferences.h"
namespace atom {
@ -38,10 +37,6 @@ void AtomBrowserClient::OverrideWebkitPrefs(
prefs->allow_running_insecure_content = true;
}
content::MediaObserver* AtomBrowserClient::GetMediaObserver() {
return MediaCaptureDevicesDispatcher::GetInstance();
}
bool AtomBrowserClient::ShouldSwapProcessesForNavigation(
content::SiteInstance* site_instance,
const GURL& current_url,