| Index: content/renderer/media/media_stream_dispatcher.h
|
| ===================================================================
|
| --- content/renderer/media/media_stream_dispatcher.h (revision 117190)
|
| +++ content/renderer/media/media_stream_dispatcher.h (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -32,22 +32,21 @@
|
| // Request a new media stream to be created.
|
| // This can be used either of WebKit or a plugin.
|
| // Note: The event_handler must be valid for as long as the stream exists.
|
| - virtual void GenerateStream(
|
| - int request_id,
|
| - MediaStreamDispatcherEventHandler* event_handler,
|
| - media_stream::StreamOptions components,
|
| - const std::string& security_origin);
|
| + void GenerateStream(int request_id,
|
| + MediaStreamDispatcherEventHandler* event_handler,
|
| + media_stream::StreamOptions components,
|
| + const std::string& security_origin);
|
|
|
| // Stop a started stream. Label is the label provided in OnStreamGenerated.
|
| - virtual void StopStream(const std::string& label);
|
| + void StopStream(const std::string& label);
|
|
|
| // Check if the label is a valid stream.
|
| - virtual bool IsStream(const std::string& label);
|
| + bool IsStream(const std::string& label);
|
| // Get the video session_id given a label. The label identifies a stream.
|
| // index is the index in the video_device_array of the stream.
|
| - virtual int video_session_id(const std::string& label, int index);
|
| + int video_session_id(const std::string& label, int index);
|
| // Returns an audio session_id given a label and an index.
|
| - virtual int audio_session_id(const std::string& label, int index);
|
| + int audio_session_id(const std::string& label, int index);
|
|
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(MediaStreamDispatcherTest, Basic);
|
|
|