diff options
| author | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 01:26:39 +0000 |
|---|---|---|
| committer | yzshen@chromium.org <yzshen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-15 01:26:39 +0000 |
| commit | dda548290e9f9a48c2fcd8ecc4a2c9cdb4b2fc0b (patch) | |
| tree | b9acb7bcd9208535f63844ab171e124f4aca2996 /android_webview | |
| parent | 21c9dee7008633174272cf5b61d547916ad31ad8 (diff) | |
| download | chromium_src-dda548290e9f9a48c2fcd8ecc4a2c9cdb4b2fc0b.zip chromium_src-dda548290e9f9a48c2fcd8ecc4a2c9cdb4b2fc0b.tar.gz chromium_src-dda548290e9f9a48c2fcd8ecc4a2c9cdb4b2fc0b.tar.bz2 | |
Change the permission check for Pepper socket API to support both the public and private APIs.
BUG=247225
TEST=None
Review URL: https://chromiumcodereview.appspot.com/17029002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.cc | 1 | ||||
| -rw-r--r-- | android_webview/browser/aw_content_browser_client.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index d58b8d7..4547ff9 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -372,6 +372,7 @@ void AwContentBrowserClient::DidCreatePpapiPlugin( bool AwContentBrowserClient::AllowPepperSocketAPI( content::BrowserContext* browser_context, const GURL& url, + bool private_api, 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 1ecd2f5..ae0267b 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h @@ -140,6 +140,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient { virtual bool AllowPepperSocketAPI( content::BrowserContext* browser_context, const GURL& url, + bool private_api, const content::SocketPermissionRequest& params) OVERRIDE; private: |