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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2629383002: Add functionality to get default media device IDs from user preferences. (Closed)
Patch Set: Created 3 years, 11 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
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/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 2344 matching lines...) Expand 10 before | Expand all | Expand 10 after
2355 } 2355 }
2356 2356
2357 bool WebContentsImpl::CheckMediaAccessPermission(const GURL& security_origin, 2357 bool WebContentsImpl::CheckMediaAccessPermission(const GURL& security_origin,
2358 MediaStreamType type) { 2358 MediaStreamType type) {
2359 DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE || 2359 DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||
2360 type == MEDIA_DEVICE_VIDEO_CAPTURE); 2360 type == MEDIA_DEVICE_VIDEO_CAPTURE);
2361 return delegate_ && 2361 return delegate_ &&
2362 delegate_->CheckMediaAccessPermission(this, security_origin, type); 2362 delegate_->CheckMediaAccessPermission(this, security_origin, type);
2363 } 2363 }
2364 2364
2365 std::string WebContentsImpl::GetDefaultMediaDeviceId(MediaStreamType type) {
2366 if (!delegate_)
2367 return std::string();
2368 return delegate_->GetDefaultMediaDeviceId(this, type);
2369 }
2370
2365 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace( 2371 SessionStorageNamespace* WebContentsImpl::GetSessionStorageNamespace(
2366 SiteInstance* instance) { 2372 SiteInstance* instance) {
2367 return controller_.GetSessionStorageNamespace(instance); 2373 return controller_.GetSessionStorageNamespace(instance);
2368 } 2374 }
2369 2375
2370 SessionStorageNamespaceMap WebContentsImpl::GetSessionStorageNamespaceMap() { 2376 SessionStorageNamespaceMap WebContentsImpl::GetSessionStorageNamespaceMap() {
2371 return controller_.GetSessionStorageNamespaceMap(); 2377 return controller_.GetSessionStorageNamespaceMap();
2372 } 2378 }
2373 2379
2374 FrameTree* WebContentsImpl::GetFrameTree() { 2380 FrameTree* WebContentsImpl::GetFrameTree() {
(...skipping 3044 matching lines...) Expand 10 before | Expand all | Expand 10 after
5419 GetMainFrame()->AddMessageToConsole( 5425 GetMainFrame()->AddMessageToConsole(
5420 content::CONSOLE_MESSAGE_LEVEL_WARNING, 5426 content::CONSOLE_MESSAGE_LEVEL_WARNING,
5421 base::StringPrintf("This site does not have a valid SSL " 5427 base::StringPrintf("This site does not have a valid SSL "
5422 "certificate! Without SSL, your site's and " 5428 "certificate! Without SSL, your site's and "
5423 "visitors' data is vulnerable to theft and " 5429 "visitors' data is vulnerable to theft and "
5424 "tampering. Get a valid SSL certificate before" 5430 "tampering. Get a valid SSL certificate before"
5425 " releasing your website to the public.")); 5431 " releasing your website to the public."));
5426 } 5432 }
5427 5433
5428 } // namespace content 5434 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698