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

Unified Diff: content/browser/renderer_host/media/video_capture_host.cc

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/browser/renderer_host/media/video_capture_host.cc
===================================================================
--- content/browser/renderer_host/media/video_capture_host.cc (revision 164646)
+++ content/browser/renderer_host/media/video_capture_host.cc (working copy)
@@ -12,9 +12,7 @@
#include "content/browser/renderer_host/media/video_capture_manager.h"
#include "content/common/media/video_capture_messages.h"
-using content::BrowserMainLoop;
-using content::BrowserMessageFilter;
-using content::BrowserThread;
+namespace content {
struct VideoCaptureHost::Entry {
Entry(VideoCaptureController* controller)
@@ -130,7 +128,7 @@
return;
Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
- video_capture::kError));
+ VIDEO_CAPTURE_STATE_ERROR));
DeleteVideoCaptureControllerOnIOThread(controller_id);
}
@@ -142,7 +140,7 @@
return;
Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
- video_capture::kPaused));
+ VIDEO_CAPTURE_STATE_PAUSED));
DeleteVideoCaptureControllerOnIOThread(controller_id);
}
@@ -160,7 +158,7 @@
params.frame_per_second = frame_per_second;
Send(new VideoCaptureMsg_DeviceInfo(controller_id.device_id, params));
Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
- video_capture::kStarted));
+ VIDEO_CAPTURE_STATE_STARTED));
}
///////////////////////////////////////////////////////////////////////////////
@@ -220,7 +218,7 @@
if (controller == NULL) {
Send(new VideoCaptureMsg_StateChanged(device_id,
- video_capture::kError));
+ VIDEO_CAPTURE_STATE_ERROR));
delete it->second;
entries_.erase(controller_id);
return;
@@ -237,15 +235,14 @@
VideoCaptureControllerID controller_id(device_id);
Send(new VideoCaptureMsg_StateChanged(device_id,
- video_capture::kStopped));
+ VIDEO_CAPTURE_STATE_STOPPED));
DeleteVideoCaptureControllerOnIOThread(controller_id);
}
void VideoCaptureHost::OnPauseCapture(int device_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
// Not used.
- Send(new VideoCaptureMsg_StateChanged(device_id,
- video_capture::kError));
+ Send(new VideoCaptureMsg_StateChanged(device_id, VIDEO_CAPTURE_STATE_ERROR));
}
void VideoCaptureHost::OnReceiveEmptyBuffer(int device_id, int buffer_id) {
@@ -277,7 +274,9 @@
entries_.erase(controller_id);
}
-media_stream::VideoCaptureManager* VideoCaptureHost::GetVideoCaptureManager() {
+VideoCaptureManager* VideoCaptureHost::GetVideoCaptureManager() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
return BrowserMainLoop::GetMediaStreamManager()->video_capture_manager();
}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698