summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorvrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 22:12:39 +0000
committervrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 22:12:39 +0000
commitd07190ab15fa49a8ed966d1badcb3d706df77c41 (patch)
tree3b14b0c5bf7e1ee5bc63fe8f567caeb25ed7a666 /android_webview
parent9de0a1096ca6e5984f87b7bda3ed131aea4e0d95 (diff)
downloadchromium_src-d07190ab15fa49a8ed966d1badcb3d706df77c41.zip
chromium_src-d07190ab15fa49a8ed966d1badcb3d706df77c41.tar.gz
chromium_src-d07190ab15fa49a8ed966d1badcb3d706df77c41.tar.bz2
Clear device labels from MediaStreamTrack.getSources() if not authorized
This CL queries the content settings to see if getSources() is authorized to fill in SourceInfo.label, and if not, clears the values before they are sent to the renderer process. BUG=240710 Review URL: https://chromiumcodereview.appspot.com/20848002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/aw_browser_context.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 7c94d79..51f1c17 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -44,6 +44,12 @@ class AwResourceContext : public content::ResourceContext {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
return getter_->GetURLRequestContext();
}
+ virtual bool AllowMicAccess(const GURL& origin) OVERRIDE {
+ return false;
+ }
+ virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE {
+ return false;
+ }
private:
net::URLRequestContextGetter* getter_;