| Index: media/video/capture/video_capture_proxy.cc
|
| diff --git a/media/video/capture/video_capture_proxy.cc b/media/video/capture/video_capture_proxy.cc
|
| index 3adbb7ce3b269ce08f7d1bc4dde4d1627b8b7eff..bbbd6108fcaa1cf9e5a20b553ffa07ee49e542f5 100644
|
| --- a/media/video/capture/video_capture_proxy.cc
|
| +++ b/media/video/capture/video_capture_proxy.cc
|
| @@ -16,8 +16,6 @@ media::VideoCaptureHandlerProxy::VideoCaptureState GetState(
|
| media::VideoCapture* capture) {
|
| media::VideoCaptureHandlerProxy::VideoCaptureState state;
|
| state.started = capture->CaptureStarted();
|
| - state.width = capture->CaptureWidth();
|
| - state.height = capture->CaptureHeight();
|
| state.frame_rate = capture->CaptureFrameRate();
|
| return state;
|
| }
|
| @@ -89,17 +87,6 @@ void VideoCaptureHandlerProxy::OnFrameReady(
|
| frame));
|
| }
|
|
|
| -void VideoCaptureHandlerProxy::OnDeviceInfoReceived(
|
| - VideoCapture* capture,
|
| - const VideoCaptureParams& device_info) {
|
| - main_message_loop_->PostTask(FROM_HERE, base::Bind(
|
| - &VideoCaptureHandlerProxy::OnDeviceInfoReceivedOnMainThread,
|
| - base::Unretained(this),
|
| - capture,
|
| - GetState(capture),
|
| - device_info));
|
| -}
|
| -
|
| void VideoCaptureHandlerProxy::OnStartedOnMainThread(
|
| VideoCapture* capture,
|
| const VideoCaptureState& state) {
|
| @@ -144,12 +131,4 @@ void VideoCaptureHandlerProxy::OnFrameReadyOnMainThread(
|
| proxied_->OnFrameReady(capture, frame);
|
| }
|
|
|
| -void VideoCaptureHandlerProxy::OnDeviceInfoReceivedOnMainThread(
|
| - VideoCapture* capture,
|
| - const VideoCaptureState& state,
|
| - const VideoCaptureParams& device_info) {
|
| - state_ = state;
|
| - proxied_->OnDeviceInfoReceived(capture, device_info);
|
| -}
|
| -
|
| } // namespace media
|
|
|