| 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 2d5ee0343d9e622ee17352c9dc2bbfb3eae5f0e6..b1df66d0d982a9cdc86dc317f9d5e6b2ddc564b9 100644
|
| --- a/chrome/browser/chrome_content_browser_client.h
|
| +++ b/chrome/browser/chrome_content_browser_client.h
|
| @@ -253,6 +253,9 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| void OverridePageVisibilityState(
|
| content::RenderFrameHost* render_frame_host,
|
| blink::WebPageVisibilityState* visibility_state) override;
|
| + // TODO(estark): remove once we decide whether to ship cookie
|
| + // prefixes. https://crbug.com/541511
|
| + bool ExperimentalFeaturesEnabled() override;
|
|
|
| #if defined(OS_ANDROID)
|
| void GetAdditionalMappedFilesForChildProcess(
|
| @@ -321,6 +324,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| const base::Callback<void(bool)>& callback);
|
| #endif
|
|
|
| + bool experimental_web_platform_features_enabled_;
|
| +
|
| #if defined(ENABLE_PLUGINS)
|
| // Set of origins that can use TCP/UDP private APIs from NaCl.
|
| std::set<std::string> allowed_socket_origins_;
|
|
|