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

Now the getUserMedia is implemented in brightray. This reverts commit f26db5c. Conflicts: atom.gyp
gischen · Aug 1, 2013 · d888f5c · d888f5c
1 parent 51cf1db
commit d888f5c
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 391 deletions.
diff --git a/atom.gyp b/atom.gyp
@@ -91,10 +91,6 @@
       'browser/file_dialog.h',
       'browser/file_dialog_mac.mm',
       'browser/file_dialog_win.cc',
-      'browser/media/media_capture_devices_dispatcher.cc',
-      'browser/media/media_capture_devices_dispatcher.h',
-      'browser/media/media_stream_devices_controller.cc',
-      'browser/media/media_stream_devices_controller.h',
       'browser/message_box.h',
       'browser/message_box_mac.mm',
       'browser/message_box_win.cc',

diff --git a/browser/atom_browser_client.cc b/browser/atom_browser_client.cc
@@ -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,

diff --git a/browser/atom_browser_client.h b/browser/atom_browser_client.h
@@ -18,7 +18,6 @@ class AtomBrowserClient : public brightray::BrowserClient {
   virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
                                    const GURL& url,
                                    WebPreferences* prefs) OVERRIDE;
-  virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
   virtual bool ShouldSwapProcessesForNavigation(
       content::SiteInstance* site_instance,
       const GURL& current_url,

diff --git a/browser/media/media_capture_devices_dispatcher.cc b/browser/media/media_capture_devices_dispatcher.cc
diff --git a/browser/media/media_capture_devices_dispatcher.h b/browser/media/media_capture_devices_dispatcher.h
diff --git a/browser/media/media_stream_devices_controller.cc b/browser/media/media_stream_devices_controller.cc