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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 180633008: Add different error codes for getUserMedia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes Created 6 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
« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/video_capture_host_unittest.cc ('k') | content/common/media/media_stream_messages.h » ('j') | content/renderer/media/media_stream_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b27565cf20d11f552324fd4d9841a2ca75aae71c..57025cc0ef0baa5b5b4c4db7940338a3c06c2e49 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1589,7 +1589,9 @@ void WebContentsImpl::RequestMediaAccessPermission(
if (delegate_)
delegate_->RequestMediaAccessPermission(this, request, callback);
else
- callback.Run(MediaStreamDevices(), scoped_ptr<MediaStreamUI>());
+ callback.Run(MediaStreamDevices(),
tommi (sloooow) - chröme 2014/03/13 14:18:05 add braces to if/else
Tommy Widenflycht 2014/03/13 15:43:50 Done.
+ MEDIA_DEVICE_INVALID_STATE,
+ scoped_ptr<MediaStreamUI>());
}
SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace(
« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/video_capture_host_unittest.cc ('k') | content/common/media/media_stream_messages.h » ('j') | content/renderer/media/media_stream_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698