Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1489)

Side by Side Diff: chrome/browser/media/media_internals.h

Issue 10835025: Plumb render view ID to media observer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/media/media_internals.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_ 5 #ifndef CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_
6 #define CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_ 6 #define CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 16 matching lines...) Expand all
27 27
28 static MediaInternals* GetInstance(); 28 static MediaInternals* GetInstance();
29 29
30 // Overridden from content::MediaObserver: 30 // Overridden from content::MediaObserver:
31 virtual void OnDeleteAudioStream(void* host, int stream_id) OVERRIDE; 31 virtual void OnDeleteAudioStream(void* host, int stream_id) OVERRIDE;
32 virtual void OnSetAudioStreamPlaying(void* host, 32 virtual void OnSetAudioStreamPlaying(void* host,
33 int stream_id, 33 int stream_id,
34 bool playing) OVERRIDE; 34 bool playing) OVERRIDE;
35 virtual void OnSetAudioStreamStatus(void* host, 35 virtual void OnSetAudioStreamStatus(void* host,
36 int stream_id, 36 int stream_id,
37 int render_process_id,
38 int render_view_id,
37 const std::string& status) OVERRIDE; 39 const std::string& status) OVERRIDE;
38 virtual void OnSetAudioStreamVolume(void* host, 40 virtual void OnSetAudioStreamVolume(void* host,
39 int stream_id, 41 int stream_id,
40 double volume) OVERRIDE; 42 double volume) OVERRIDE;
41 virtual void OnMediaEvent(int render_process_id, 43 virtual void OnMediaEvent(int render_process_id,
42 const media::MediaLogEvent& event) OVERRIDE; 44 const media::MediaLogEvent& event) OVERRIDE;
43 virtual void OnCaptureDevicesOpened( 45 virtual void OnCaptureDevicesOpened(
44 int render_process_id, 46 int render_process_id,
45 int render_view_id, 47 int render_view_id,
46 const content::MediaStreamDevices& devices) OVERRIDE; 48 const content::MediaStreamDevices& devices) OVERRIDE;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 83
82 static MediaInternals* instance_; 84 static MediaInternals* instance_;
83 DictionaryValue data_; 85 DictionaryValue data_;
84 ObserverList<MediaInternalsObserver> observers_; 86 ObserverList<MediaInternalsObserver> observers_;
85 scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_; 87 scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_;
86 88
87 DISALLOW_COPY_AND_ASSIGN(MediaInternals); 89 DISALLOW_COPY_AND_ASSIGN(MediaInternals);
88 }; 90 };
89 91
90 #endif // CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_ 92 #endif // CHROME_BROWSER_MEDIA_MEDIA_INTERNALS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/media_internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698