| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 49e88a6af36059bc2fd45e1c0183f3304edba5c5..a48a0c7c0a375b539d989cfbdcac5adf68db371b 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -2540,6 +2540,17 @@ bool ChromeContentBrowserClient::AllowPepperSocketAPI(
|
| #endif
|
| }
|
|
|
| +bool ChromeContentBrowserClient::IsPepperVpnProviderAPIAllowed(
|
| + content::BrowserContext* browser_context,
|
| + const GURL& url) {
|
| +#if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS)
|
| + return ChromeContentBrowserClientPluginsPart::IsPepperVpnProviderAPIAllowed(
|
| + browser_context, url);
|
| +#else
|
| + return false;
|
| +#endif
|
| +}
|
| +
|
| ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy(
|
| WebContents* web_contents) {
|
| return new ChromeSelectFilePolicy(web_contents);
|
|
|