Media Related changes for TabCapture API

content/browser/renderer_host/media/media_stream_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MediaStreamManager is used to open/enumerate media capture devices (video
 // supported now). Call flow:
 // 1. GenerateStream is called when a render process wants to use a capture
 //    device.
 // 2. MediaStreamManager will ask MediaStreamDeviceSettings for permission to
 //    use devices and for which device to use.
@@ skipping 68 matching lines @@
 // MediaStreamManager is used to generate and close new media devices, not to
 // start the media flow.
 // The classes requesting new media streams are answered using
 // MediaStreamManager::Listener.
 class CONTENT_EXPORT MediaStreamManager
     : public MediaStreamProviderListener,
       public MessageLoop::DestructionObserver,
       public SettingsRequester,
       public base::SystemMonitor::DevicesChangedObserver {
  public:
+  // Contains all data needed to keep track of requests.
+  class DeviceRequest;

[no longer working on chromium, 2012/10/12 14:00:59]

why expose it to public, can we keep it to private?

[justinlin, 2012/10/12 20:04:20]

Done. Can move it back now that the static is gone.

+
   explicit MediaStreamManager(media::AudioManager* audio_manager);
   virtual ~MediaStreamManager();
 
   // Used to access VideoCaptureManager.
   VideoCaptureManager* video_capture_manager();
 
   // Used to access AudioInputDeviceManager.
   AudioInputDeviceManager* audio_input_device_manager();
 
   // GenerateStream opens new media devices according to |components|.  It
@@ skipping 71 matching lines @@
   // Call to have all GenerateStream calls from now on use fake devices instead
   // of real ones. This should NOT be used in production versions of Chrome.
   static void AlwaysUseFakeDevice();
 
   // This object gets deleted on the UI thread after the IO thread has been
   // destroyed. So we need to know when IO thread is being destroyed so that
   // we can delete VideoCaptureManager and AudioInputDeviceManager.
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
  private:
-  // Contains all data needed to keep track of requests.
-  struct DeviceRequest;
-
   // Cache enumerated device list.
   struct EnumerationCache {
     EnumerationCache();
     ~EnumerationCache();
 
     bool valid;
     StreamDeviceInfoArray devices;
   };
 
   // Helpers for signaling the media observer that new capture devices are
@@ skipping 59 matching lines @@
 
   // Static members.
   static bool always_use_fake_devices_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };
 
 }  // namespace media_stream
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_