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

Unified Diff: content/renderer/media/video_capture_impl.h

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/video_capture_impl.h
===================================================================
--- content/renderer/media/video_capture_impl.h (revision 164646)
+++ content/renderer/media/video_capture_impl.h (working copy)
@@ -52,7 +52,7 @@
virtual void OnBufferCreated(base::SharedMemoryHandle handle,
int length, int buffer_id) OVERRIDE;
virtual void OnBufferReceived(int buffer_id, base::Time timestamp) OVERRIDE;
- virtual void OnStateChanged(video_capture::State state) OVERRIDE;
+ virtual void OnStateChanged(VideoCaptureState state) OVERRIDE;
virtual void OnDeviceInfoReceived(
const media::VideoCaptureParams& device_info) OVERRIDE;
virtual void OnDelegateAdded(int32 device_id) OVERRIDE;
@@ -80,7 +80,7 @@
void DoBufferCreatedOnCaptureThread(base::SharedMemoryHandle handle,
int length, int buffer_id);
void DoBufferReceivedOnCaptureThread(int buffer_id, base::Time timestamp);
- void DoStateChangedOnCaptureThread(video_capture::State state);
+ void DoStateChangedOnCaptureThread(VideoCaptureState state);
void DoDeviceInfoReceivedOnCaptureThread(
const media::VideoCaptureParams& device_info);
void DoDelegateAddedOnCaptureThread(int32 device_id);
@@ -124,7 +124,7 @@
media::VideoCaptureParams device_info_;
bool device_info_available_;
- video_capture::State state_;
+ VideoCaptureState state_;
DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl);
};

Powered by Google App Engine
This is Rietveld 408576698