summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prerender/prerender_manager.h
diff options
context:
space:
mode:
authorshishir@chromium.org <shishir@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-18 04:31:35 +0000
committershishir@chromium.org <shishir@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-18 04:31:35 +0000
commit3e026f4caaff1061ecae67c6de1f39c367d158f7 (patch)
treee8cdb01b12cadc3e0f82aa233164e95048dd2015 /chrome/browser/prerender/prerender_manager.h
parentc41ea859f70938d4a87ec834759c440489bdc00b (diff)
downloadchromium_src-3e026f4caaff1061ecae67c6de1f39c367d158f7.zip
chromium_src-3e026f4caaff1061ecae67c6de1f39c367d158f7.tar.gz
chromium_src-3e026f4caaff1061ecae67c6de1f39c367d158f7.tar.bz2
Prerender: Cancel prerender on creation of any Audio Stream
BUG=136262 Review URL: https://chromiumcodereview.appspot.com/19220003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_manager.h')
-rw-r--r--chrome/browser/prerender/prerender_manager.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 67ff3f3..8789699 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -19,6 +19,7 @@
#include "base/threading/non_thread_safe.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
+#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "chrome/browser/predictors/logged_in_predictor_table.h"
#include "chrome/browser/prerender/prerender_config.h"
#include "chrome/browser/prerender/prerender_contents.h"
@@ -78,7 +79,8 @@ class PrerenderTracker;
class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
public base::NonThreadSafe,
public content::NotificationObserver,
- public BrowserContextKeyedService {
+ public BrowserContextKeyedService,
+ public MediaCaptureDevicesDispatcher::Observer {
public:
// NOTE: New values need to be appended, since they are used in histograms.
enum PrerenderManagerMode {
@@ -274,6 +276,10 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
+ // MediaCaptureDevicesDispatcher::Observer
+ virtual void OnCreatingAudioStream(int render_process_id,
+ int render_view_id) OVERRIDE;
+
const Config& config() const { return config_; }
Config& mutable_config() { return config_; }