diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 06:31:58 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 06:31:58 +0000 |
| commit | 157cc900b4c4e4128fc85c39c6a24bde55237a03 (patch) | |
| tree | cc6483c3c1690a037d70b399e139d26d6c6a8512 /android_webview/browser | |
| parent | dc2029f0fc2e26e5cb11fe783fd06e380247f4aa (diff) | |
| download | chromium_src-157cc900b4c4e4128fc85c39c6a24bde55237a03.zip chromium_src-157cc900b4c4e4128fc85c39c6a24bde55237a03.tar.gz chromium_src-157cc900b4c4e4128fc85c39c6a24bde55237a03.tar.bz2 | |
Use extensions socket permission for TCP/UDP socket APIs in Pepper
This CL is first step in removing whitelist of extensions.
It makes permission check same as extensions do.
BUG=124311
TEST=browser_tests for TCP/UDP
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=165376
Review URL: https://codereview.chromium.org/10993078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.cc | 3 | ||||
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 634c135..7caa743 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -311,7 +311,8 @@ void AwContentBrowserClient::DidCreatePpapiPlugin( bool AwContentBrowserClient::AllowPepperSocketAPI( content::BrowserContext* browser_context, - const GURL& url) { + const GURL& url, + const content::SocketPermissionRequest& params) { NOTREACHED() << "Android WebView does not support plugins"; return false; } diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index f69333e..2a83f20 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h @@ -115,8 +115,10 @@ class AwContentBrowserClient : public content::ContentBrowserClient { virtual std::string GetDefaultDownloadName() OVERRIDE; virtual void DidCreatePpapiPlugin( content::BrowserPpapiHost* browser_host) OVERRIDE; - virtual bool AllowPepperSocketAPI(content::BrowserContext* browser_context, - const GURL& url) OVERRIDE; + virtual bool AllowPepperSocketAPI( + content::BrowserContext* browser_context, + const GURL& url, + const content::SocketPermissionRequest& params) OVERRIDE; private: // Android WebView currently has a single global (non-off-the-record) browser // context. |