| Index: content/shell/browser/shell_network_delegate.cc
|
| diff --git a/content/shell/browser/shell_network_delegate.cc b/content/shell/browser/shell_network_delegate.cc
|
| index ae638d5e7ff07f233fda60ec9e51ab8e9c0e1bea..4fa99e8ed611b1b374e6f193fb97accdbb29f74a 100644
|
| --- a/content/shell/browser/shell_network_delegate.cc
|
| +++ b/content/shell/browser/shell_network_delegate.cc
|
| @@ -14,7 +14,7 @@
|
| namespace content {
|
|
|
| namespace {
|
| -bool g_accept_all_cookies = true;
|
| +bool g_block_third_party_cookies = false;
|
| }
|
|
|
| ShellNetworkDelegate::ShellNetworkDelegate() {
|
| @@ -23,8 +23,8 @@ ShellNetworkDelegate::ShellNetworkDelegate() {
|
| ShellNetworkDelegate::~ShellNetworkDelegate() {
|
| }
|
|
|
| -void ShellNetworkDelegate::SetAcceptAllCookies(bool accept) {
|
| - g_accept_all_cookies = accept;
|
| +void ShellNetworkDelegate::SetBlockThirdPartyCookies(bool block) {
|
| + g_block_third_party_cookies = block;
|
| }
|
|
|
| int ShellNetworkDelegate::OnBeforeURLRequest(
|
| @@ -81,9 +81,9 @@ ShellNetworkDelegate::AuthRequiredResponse ShellNetworkDelegate::OnAuthRequired(
|
|
|
| bool ShellNetworkDelegate::OnCanGetCookies(const net::URLRequest& request,
|
| const net::CookieList& cookie_list) {
|
| - net::StaticCookiePolicy::Type policy_type = g_accept_all_cookies ?
|
| - net::StaticCookiePolicy::ALLOW_ALL_COOKIES :
|
| - net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES;
|
| + net::StaticCookiePolicy::Type policy_type = g_block_third_party_cookies ?
|
| + net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES :
|
| + net::StaticCookiePolicy::ALLOW_ALL_COOKIES;
|
| net::StaticCookiePolicy policy(policy_type);
|
| int rv = policy.CanGetCookies(
|
| request.url(), request.first_party_for_cookies());
|
| @@ -93,9 +93,9 @@ bool ShellNetworkDelegate::OnCanGetCookies(const net::URLRequest& request,
|
| bool ShellNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
|
| const std::string& cookie_line,
|
| net::CookieOptions* options) {
|
| - net::StaticCookiePolicy::Type policy_type = g_accept_all_cookies ?
|
| - net::StaticCookiePolicy::ALLOW_ALL_COOKIES :
|
| - net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES;
|
| + net::StaticCookiePolicy::Type policy_type = g_block_third_party_cookies ?
|
| + net::StaticCookiePolicy::BLOCK_ALL_THIRD_PARTY_COOKIES :
|
| + net::StaticCookiePolicy::ALLOW_ALL_COOKIES;
|
| net::StaticCookiePolicy policy(policy_type);
|
| int rv = policy.CanSetCookie(
|
| request.url(), request.first_party_for_cookies());
|
|
|