| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/search_provider_logos/logo_tracker.h" | 5 #include "components/search_provider_logos/logo_tracker.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 file_task_runner_->PostTask( | 89 file_task_runner_->PostTask( |
| 90 FROM_HERE, base::Bind(&DeleteLogoCacheOnFileThread, logo_cache_)); | 90 FROM_HERE, base::Bind(&DeleteLogoCacheOnFileThread, logo_cache_)); |
| 91 logo_cache_ = NULL; | 91 logo_cache_ = NULL; |
| 92 } | 92 } |
| 93 | 93 |
| 94 void LogoTracker::SetServerAPI( | 94 void LogoTracker::SetServerAPI( |
| 95 const GURL& logo_url, | 95 const GURL& logo_url, |
| 96 const ParseLogoResponse& parse_logo_response_func, | 96 const ParseLogoResponse& parse_logo_response_func, |
| 97 const AppendQueryparamsToLogoURL& append_queryparams_func, | 97 const AppendQueryparamsToLogoURL& append_queryparams_func, |
| 98 bool wants_cta, | 98 bool wants_cta, |
| 99 bool transparent) { | 99 bool gray_background) { |
| 100 if (logo_url == logo_url_) | 100 if (logo_url == logo_url_) |
| 101 return; | 101 return; |
| 102 | 102 |
| 103 ReturnToIdle(kDownloadOutcomeNotTracked); | 103 ReturnToIdle(kDownloadOutcomeNotTracked); |
| 104 | 104 |
| 105 logo_url_ = logo_url; | 105 logo_url_ = logo_url; |
| 106 parse_logo_response_func_ = parse_logo_response_func; | 106 parse_logo_response_func_ = parse_logo_response_func; |
| 107 append_queryparams_func_ = append_queryparams_func; | 107 append_queryparams_func_ = append_queryparams_func; |
| 108 wants_cta_ = wants_cta; | 108 wants_cta_ = wants_cta; |
| 109 transparent_ = transparent; | 109 gray_background_ = gray_background; |
| 110 } | 110 } |
| 111 | 111 |
| 112 void LogoTracker::GetLogo(LogoObserver* observer) { | 112 void LogoTracker::GetLogo(LogoObserver* observer) { |
| 113 DCHECK(!logo_url_.is_empty()); | 113 DCHECK(!logo_url_.is_empty()); |
| 114 logo_observers_.AddObserver(observer); | 114 logo_observers_.AddObserver(observer); |
| 115 | 115 |
| 116 if (is_idle_) { | 116 if (is_idle_) { |
| 117 is_idle_ = false; | 117 is_idle_ = false; |
| 118 base::PostTaskAndReplyWithResult( | 118 base::PostTaskAndReplyWithResult( |
| 119 file_task_runner_.get(), | 119 file_task_runner_.get(), |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 std::string fingerprint; | 216 std::string fingerprint; |
| 217 if (cached_logo_ && !cached_logo_->metadata.fingerprint.empty() && | 217 if (cached_logo_ && !cached_logo_->metadata.fingerprint.empty() && |
| 218 cached_logo_->metadata.expiration_time >= clock_->Now()) { | 218 cached_logo_->metadata.expiration_time >= clock_->Now()) { |
| 219 fingerprint = cached_logo_->metadata.fingerprint; | 219 fingerprint = cached_logo_->metadata.fingerprint; |
| 220 } | 220 } |
| 221 GURL url; | 221 GURL url; |
| 222 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 222 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 223 if (command_line->HasSwitch(switches::kGoogleDoodleUrl)) { | 223 if (command_line->HasSwitch(switches::kGoogleDoodleUrl)) { |
| 224 url = GURL(command_line->GetSwitchValueASCII(switches::kGoogleDoodleUrl)); | 224 url = GURL(command_line->GetSwitchValueASCII(switches::kGoogleDoodleUrl)); |
| 225 } else { | 225 } else { |
| 226 url = append_queryparams_func_.Run( | 226 url = append_queryparams_func_.Run(logo_url_, fingerprint, wants_cta_, |
| 227 logo_url_, fingerprint, wants_cta_, transparent_); | 227 gray_background_); |
| 228 } | 228 } |
| 229 | 229 |
| 230 net::NetworkTrafficAnnotationTag traffic_annotation = | 230 net::NetworkTrafficAnnotationTag traffic_annotation = |
| 231 net::DefineNetworkTrafficAnnotation("logo_tracker", R"( | 231 net::DefineNetworkTrafficAnnotation("logo_tracker", R"( |
| 232 semantics { | 232 semantics { |
| 233 sender: "Logo Tracker" | 233 sender: "Logo Tracker" |
| 234 description: | 234 description: |
| 235 "Provides the logo image (aka Doodle) if Google is your configured " | 235 "Provides the logo image (aka Doodle) if Google is your configured " |
| 236 "search provider." | 236 "search provider." |
| 237 trigger: "Displaying the new tab page on iOS or Android." | 237 trigger: "Displaying the new tab page on iOS or Android." |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 int64_t current, | 373 int64_t current, |
| 374 int64_t total, | 374 int64_t total, |
| 375 int64_t current_network_bytes) { | 375 int64_t current_network_bytes) { |
| 376 if (total > kMaxDownloadBytes || current > kMaxDownloadBytes) { | 376 if (total > kMaxDownloadBytes || current > kMaxDownloadBytes) { |
| 377 LOG(WARNING) << "Search provider logo exceeded download size limit"; | 377 LOG(WARNING) << "Search provider logo exceeded download size limit"; |
| 378 ReturnToIdle(DOWNLOAD_OUTCOME_DOWNLOAD_FAILED); | 378 ReturnToIdle(DOWNLOAD_OUTCOME_DOWNLOAD_FAILED); |
| 379 } | 379 } |
| 380 } | 380 } |
| 381 | 381 |
| 382 } // namespace search_provider_logos | 382 } // namespace search_provider_logos |
| OLD | NEW |