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

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

Issue 17846002: Refactor the VideoCaptureDevice::Name struct. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 years, 6 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
« no previous file with comments | « no previous file | content/browser/renderer_host/media/video_capture_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/screen_capture_device.cc
diff --git a/content/browser/renderer_host/media/screen_capture_device.cc b/content/browser/renderer_host/media/screen_capture_device.cc
index 21a638d6b4fa3972fde8e289e198deb0b74336d3..e455c48f06f8b1418bf033fb8d8b335bcd198fa3 100644
--- a/content/browser/renderer_host/media/screen_capture_device.cc
+++ b/content/browser/renderer_host/media/screen_capture_device.cc
@@ -347,8 +347,7 @@ void ScreenCaptureDevice::Core::DoCapture() {
ScreenCaptureDevice::ScreenCaptureDevice(
scoped_refptr<base::SequencedTaskRunner> task_runner)
- : core_(new Core(task_runner)) {
- name_.device_name = "Screen";
+ : core_(new Core(task_runner)), name_("Screen", "Screen") {
}
ScreenCaptureDevice::~ScreenCaptureDevice() {
@@ -356,7 +355,7 @@ ScreenCaptureDevice::~ScreenCaptureDevice() {
}
void ScreenCaptureDevice::SetScreenCapturerForTest(
- scoped_ptr<webrtc::ScreenCapturer> capturer) {
+ scoped_ptr<webrtc::ScreenCapturer> capturer) {
core_->SetScreenCapturerForTest(capturer.Pass());
}
« no previous file with comments | « no previous file | content/browser/renderer_host/media/video_capture_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698