| Index: chrome/browser/chrome_content_browser_client.h
|
| diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
|
| index b9145764c0238edf16e2542809fcd1bba9862e04..fdcae43c4c5420cf817c0907542ed99b4f029201 100644
|
| --- a/chrome/browser/chrome_content_browser_client.h
|
| +++ b/chrome/browser/chrome_content_browser_client.h
|
| @@ -286,7 +286,9 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| virtual bool IsPluginAllowedToCallRequestOSFileHandle(
|
| content::BrowserContext* browser_context,
|
| const GURL& url) OVERRIDE;
|
| - virtual bool IsPluginAllowedToUseDevChannelAPIs() OVERRIDE;
|
| + virtual bool IsPluginAllowedToUseDevChannelAPIs(
|
| + content::BrowserContext* browser_context,
|
| + const GURL& url) OVERRIDE;
|
| virtual net::CookieStore* OverrideCookieStoreForRenderProcess(
|
| int render_process_id) OVERRIDE;
|
|
|
| @@ -316,6 +318,9 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| std::set<std::string> allowed_socket_origins_;
|
| // Set of origins that can get a handle for FileIO from NaCl.
|
| std::set<std::string> allowed_file_handle_origins_;
|
| + // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
|
| + // versions of Chrome.
|
| + std::set<std::string> allowed_dev_channel_origins_;
|
| #endif
|
| scoped_ptr<extensions::BrowserPermissionsPolicyDelegate>
|
| permissions_policy_delegate_;
|
|
|