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

Unified Diff: content/renderer/media/user_media_client_impl.cc

Issue 2751643003: Minor refactoring of SelectSettings results for consistency. (Closed)
Patch Set: rebase Created 3 years, 9 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 | « content/renderer/media/user_media_client_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/user_media_client_impl.cc
diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc
index 439e0afa30b00295e8b8cb57191099fc6ff3cd8b..494b81716137b7ebe059c48aab8b1abb2eb32853 100644
--- a/content/renderer/media/user_media_client_impl.cc
+++ b/content/renderer/media/user_media_client_impl.cc
@@ -394,7 +394,7 @@ void UserMediaClientImpl::FinalizeSelectVideoDeviceSourceSettings(
const VideoDeviceCaptureSourceSelectionResult& selection_result) {
DCHECK(CalledOnValidThread());
if (selection_result.HasValue()) {
- controls->video.device_id = selection_result.device_id;
+ controls->video.device_id = selection_result.device_id();
} else {
// TODO(guidou): Abort the request in all cases where |selection_result|
// has no value, as the spec mandates.
@@ -403,7 +403,7 @@ void UserMediaClientImpl::FinalizeSelectVideoDeviceSourceSettings(
// devices. Fix once the standard behavior ceases to be disruptive.
// See http://crbug.com/690491.
blink::WebString failed_constraint_name =
- blink::WebString::fromASCII(selection_result.failed_constraint_name);
+ blink::WebString::fromASCII(selection_result.failed_constraint_name());
blink::WebString device_id_constraint_name = blink::WebString::fromASCII(
user_media_request.videoConstraints().basic().deviceId.name());
if (failed_constraint_name.equals(device_id_constraint_name)) {
« no previous file with comments | « content/renderer/media/user_media_client_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698