Chromium Code Reviews| Index: components/doodle/doodle_fetcher_impl.cc |
| diff --git a/components/doodle/doodle_fetcher_impl.cc b/components/doodle/doodle_fetcher_impl.cc |
| index b1c8188b88c70b13569db6fa497a296016806a29..07fd3f0b94011037b1ccfbaea18ac493f43b3892 100644 |
| --- a/components/doodle/doodle_fetcher_impl.cc |
| +++ b/components/doodle/doodle_fetcher_impl.cc |
| @@ -87,11 +87,13 @@ void DoodleFetcherImpl::FetchDoodle(FinishedCallback callback) { |
| "currently running Doodle." |
| trigger: |
| "Displaying the new tab page on Android." |
| - data: "None." |
| + data: |
| + "The user's Google cookies to show for example birthday doodles at " |
| + "appropriate times." |
|
fhorschig
2017/04/26 08:08:53
nit: pretty hard to read. How about:
The user's G
Marc Treib
2017/04/26 08:32:00
Done.
|
| destination: GOOGLE_OWNED_SERVICE |
| } |
| policy { |
| - cookies_allowed: false |
| + cookies_allowed: true |
| setting: |
| "Choosing a non-Google search engine in Chromium settings under " |
| "'Search Engine' will disable this feature." |
| @@ -103,9 +105,8 @@ void DoodleFetcherImpl::FetchDoodle(FinishedCallback callback) { |
| BuildDoodleURL(GetGoogleBaseUrl(), gray_background_, override_url_), |
| URLFetcher::GET, this, traffic_annotation); |
| fetcher_->SetRequestContext(download_context_.get()); |
| - fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | |
| - net::LOAD_DO_NOT_SAVE_COOKIES | |
| - net::LOAD_DO_NOT_SEND_AUTH_DATA); |
| + // TODO(treib): Use OAuth2 authentication instead of cookies. crbug.com/711314 |
| + fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_AUTH_DATA); |
| fetcher_->SetAutomaticallyRetryOnNetworkChanges(1); |
| data_use_measurement::DataUseUserData::AttachToFetcher( |
| fetcher_.get(), data_use_measurement::DataUseUserData::DOODLE); |