summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_content_browser_client.h
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 12:45:29 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 12:45:29 +0000
commita658d45f0b8e97ccd18f24c05d52f737bfc8f8f2 (patch)
tree30a324e8e5e9ebaeaad1fd4521f2a516b0cc42a9 /chrome/browser/chrome_content_browser_client.h
parent8149ac3e8a19dc7a1c84447c9eff0d5a3d7dd6e4 (diff)
downloadchromium_src-a658d45f0b8e97ccd18f24c05d52f737bfc8f8f2.zip
chromium_src-a658d45f0b8e97ccd18f24c05d52f737bfc8f8f2.tar.gz
chromium_src-a658d45f0b8e97ccd18f24c05d52f737bfc8f8f2.tar.bz2
Make socket permission also allow Pepper sockets
BUG=116225 TEST=manual Review URL: https://chromiumcodereview.appspot.com/9539011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.h')
-rw-r--r--chrome/browser/chrome_content_browser_client.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index 401aeb3..c12d9d6 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -155,7 +155,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
virtual void ClearCookies(RenderViewHost* rvh) OVERRIDE;
virtual FilePath GetDefaultDownloadDirectory() OVERRIDE;
virtual std::string GetDefaultDownloadName() OVERRIDE;
- virtual bool AllowSocketAPI(const GURL& url) OVERRIDE;
+ virtual bool AllowSocketAPI(content::BrowserContext* browser_context,
+ const GURL& url) OVERRIDE;
#if defined(OS_POSIX) && !defined(OS_MACOSX)
virtual int GetCrashSignalFD(const CommandLine& command_line) OVERRIDE;