Part 2: Plumb render view ID to content::MediaObserver

chrome/browser/media/media_internals.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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
@@ skipping 10 matching lines @@
 // This class stores information about currently active media.
 // It's constructed on the UI thread but all of its methods are called on the IO
 // thread.
 class MediaInternals : public content::MediaObserver {
  public:
   virtual ~MediaInternals();
 
   static MediaInternals* GetInstance();
 
   // Overridden from content::MediaObserver:
-  virtual void OnDeleteAudioStream(void* host, int stream_id) OVERRIDE;
-  virtual void OnSetAudioStreamPlaying(void* host,
+  virtual void OnDeleteAudioStream(int render_process_id,
+                                   int render_view_id,
+                                   int stream_id) OVERRIDE;
+  virtual void OnSetAudioStreamPlaying(int render_process_id,
+                                       int render_view_id,
                                        int stream_id,
                                        bool playing) OVERRIDE;
-  virtual void OnSetAudioStreamStatus(void* host,
+  virtual void OnSetAudioStreamStatus(int render_process_id,
+                                      int render_view_id,
                                       int stream_id,
                                       const std::string& status) OVERRIDE;
-  virtual void OnSetAudioStreamVolume(void* host,
+  virtual void OnSetAudioStreamVolume(int render_process_id,
+                                      int render_view_id,
                                       int stream_id,
                                       double volume) OVERRIDE;
   virtual void OnMediaEvent(int render_process_id,
                             const media::MediaLogEvent& event) OVERRIDE;
   virtual void OnCaptureDevicesOpened(
       int render_process_id,
       int render_view_id,
       const content::MediaStreamDevices& devices) OVERRIDE;
   virtual void OnCaptureDevicesClosed(
       int render_process_id,
       int render_view_id,
       const content::MediaStreamDevices& devices) OVERRIDE;
 
   // Methods for observers.
   // Observers should add themselves on construction and remove themselves
   // on destruction.
   void AddObserver(MediaInternalsObserver* observer);
   void RemoveObserver(MediaInternalsObserver* observer);
   void SendEverything();
 
  private:
   friend class MediaInternalsTest;
   friend struct DefaultSingletonTraits<MediaInternals>;
 
   MediaInternals();
 
   // Sets |property| of an audio stream to |value| and notifies observers.
-  // (host, stream_id) is a unique id for the audio stream.
-  // |host| will never be dereferenced.
-  void UpdateAudioStream(void* host, int stream_id,
+  // (render_process_id, render_view_id, stream_id) is a unique id for the
+  // audio stream.
+  void UpdateAudioStream(int render_process_id, int render_view_id,
+                         int stream_id,
                          const std::string& property, Value* value);
 
   // Removes |item| from |data_|.
   void DeleteItem(const std::string& item);
 
   // Sets data_.id.property = value and notifies attached UIs using update_fn.
   // id may be any depth, e.g. "video.decoders.1.2.3"
-  void UpdateItem(const std::string& update_fn, const std::string& id,
-                  const std::string& property, Value* value);
+  void UpdateItem(const std::string& update_fn,
+                  int render_process_id, int render_view_id,
+                  const std::string& id, const std::string& property,
+                  Value* value);
 
   // Calls javascript |function|(|value|) on each attached UI.
   void SendUpdate(const std::string& function, Value* value);
 
   static MediaInternals* instance_;
   DictionaryValue data_;
   ObserverList<MediaInternalsObserver> observers_;
   scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaInternals);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_