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

Side by Side Diff: Source/web/WebUserMediaRequest.cpp

Issue 180683003: MediaStream API: Addding support for UA specific error messages for gUM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/modules/mediastream/UserMediaRequest.cpp ('k') | public/web/WebUserMediaRequest.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 ASSERT(!isNull()); 100 ASSERT(!isNull());
101 return WebDocument(m_private->ownerDocument()); 101 return WebDocument(m_private->ownerDocument());
102 } 102 }
103 103
104 void WebUserMediaRequest::requestSucceeded(const WebMediaStream& streamDescripto r) 104 void WebUserMediaRequest::requestSucceeded(const WebMediaStream& streamDescripto r)
105 { 105 {
106 ASSERT(!isNull() && !streamDescriptor.isNull()); 106 ASSERT(!isNull() && !streamDescriptor.isNull());
107 m_private->succeed(streamDescriptor); 107 m_private->succeed(streamDescriptor);
108 } 108 }
109 109
110 void WebUserMediaRequest::requestFailed(const WebString& description) 110 void WebUserMediaRequest::requestDenied(const WebString& description)
111 { 111 {
112 ASSERT(!isNull()); 112 ASSERT(!isNull());
113 m_private->fail(description); 113 m_private->failPermissionDenied(description);
114 } 114 }
115 115
116 void WebUserMediaRequest::requestFailedConstraint(const WebString& constraintNam e, const WebString& description) 116 void WebUserMediaRequest::requestFailedConstraint(const WebString& constraintNam e, const WebString& description)
117 { 117 {
118 ASSERT(!isNull()); 118 ASSERT(!isNull());
119 m_private->failConstraint(constraintName, description); 119 m_private->failConstraint(constraintName, description);
120 } 120 }
121 121
122 void WebUserMediaRequest::requestFailedUASpecific(const WebString& name, const W ebString& constraintName, const WebString& description)
123 {
124 ASSERT(!isNull());
125 m_private->failUASpecific(name, constraintName, description);
126 }
127
122 bool WebUserMediaRequest::equals(const WebUserMediaRequest& other) const 128 bool WebUserMediaRequest::equals(const WebUserMediaRequest& other) const
123 { 129 {
124 if (isNull() || other.isNull()) 130 if (isNull() || other.isNull())
125 return false; 131 return false;
126 return m_private.get() == other.m_private.get(); 132 return m_private.get() == other.m_private.get();
127 } 133 }
128 134
129 void WebUserMediaRequest::assign(const WebUserMediaRequest& other) 135 void WebUserMediaRequest::assign(const WebUserMediaRequest& other)
130 { 136 {
131 m_private = other.m_private; 137 m_private = other.m_private;
132 } 138 }
133 139
134 WebUserMediaRequest::operator UserMediaRequest*() const 140 WebUserMediaRequest::operator UserMediaRequest*() const
135 { 141 {
136 return m_private.get(); 142 return m_private.get();
137 } 143 }
138 144
139 } // namespace blink 145 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/mediastream/UserMediaRequest.cpp ('k') | public/web/WebUserMediaRequest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698