Media Related changes for TabCapture API

content/browser/renderer_host/media/media_stream_manager.h

Index: content/browser/renderer_host/media/media_stream_manager.h
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index 7057b50776b05640ba907137a319e9a84e4c6cbe..aa79d12e84fcce3db74ecdbe3a503e1a6e639225 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -86,6 +86,9 @@ class CONTENT_EXPORT MediaStreamManager
       public SettingsRequester,
       public base::SystemMonitor::DevicesChangedObserver {
  public:
+  // Contains all data needed to keep track of requests.
+  struct DeviceRequest;

[no longer working on chromium, 2012/10/04 18:41:49]

Do we have to do this?

[justinlin, 2012/10/08 08:59:45]

Yes, otherwise the statics cannot access this struct.

+
   explicit MediaStreamManager(media::AudioManager* audio_manager);
   virtual ~MediaStreamManager();
 
@@ -177,9 +180,6 @@ class CONTENT_EXPORT MediaStreamManager
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
  private:
-  // Contains all data needed to keep track of requests.
-  struct DeviceRequest;
-
   // Cache enumerated device list.
   struct EnumerationCache {
     EnumerationCache();