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

Side by Side Diff: content/public/browser/web_contents_delegate.cc

Issue 180633008: Add different error codes for getUserMedia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed comments 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/browser/web_contents_delegate.h" 5 #include "content/public/browser/web_contents_delegate.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "content/public/browser/render_view_host.h" 10 #include "content/public/browser/render_view_host.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 WebContents* web_contents, 153 WebContents* web_contents,
154 SkColor color, 154 SkColor color,
155 const std::vector<ColorSuggestion>& suggestions) { 155 const std::vector<ColorSuggestion>& suggestions) {
156 return NULL; 156 return NULL;
157 } 157 }
158 158
159 void WebContentsDelegate::RequestMediaAccessPermission( 159 void WebContentsDelegate::RequestMediaAccessPermission(
160 WebContents* web_contents, 160 WebContents* web_contents,
161 const MediaStreamRequest& request, 161 const MediaStreamRequest& request,
162 const MediaResponseCallback& callback) { 162 const MediaResponseCallback& callback) {
163 callback.Run(MediaStreamDevices(), scoped_ptr<MediaStreamUI>()); 163 callback.Run(MediaStreamDevices(),
164 MEDIA_DEVICE_INVALID_STATE,
165 scoped_ptr<MediaStreamUI>());
164 } 166 }
165 167
166 bool WebContentsDelegate::RequestPpapiBrokerPermission( 168 bool WebContentsDelegate::RequestPpapiBrokerPermission(
167 WebContents* web_contents, 169 WebContents* web_contents,
168 const GURL& url, 170 const GURL& url,
169 const base::FilePath& plugin_path, 171 const base::FilePath& plugin_path,
170 const base::Callback<void(bool)>& callback) { 172 const base::Callback<void(bool)>& callback) {
171 return false; 173 return false;
172 } 174 }
173 175
(...skipping 14 matching lines...) Expand all
188 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end()); 190 DCHECK(attached_contents_.find(web_contents) != attached_contents_.end());
189 attached_contents_.erase(web_contents); 191 attached_contents_.erase(web_contents);
190 } 192 }
191 193
192 gfx::Size WebContentsDelegate::GetSizeForNewRenderView( 194 gfx::Size WebContentsDelegate::GetSizeForNewRenderView(
193 const WebContents* web_contents) const { 195 const WebContents* web_contents) const {
194 return gfx::Size(); 196 return gfx::Size();
195 } 197 }
196 198
197 } // namespace content 199 } // namespace content
OLDNEW
« no previous file with comments | « content/common/media/media_stream_messages.h ('k') | content/public/common/media_stream_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698