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 "chrome/browser/android/logo_service.h" | 5 #include "chrome/browser/android/logo_service.h" |
6 | 6 |
7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
8 #include "chrome/browser/image_decoder.h" | 8 #include "chrome/browser/image_decoder.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/search_engines/template_url_service_factory.h" | 10 #include "chrome/browser/search_engines/template_url_service_factory.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), | 117 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), |
118 BrowserThread::GetBlockingPool(), | 118 BrowserThread::GetBlockingPool(), |
119 profile_->GetRequestContext(), | 119 profile_->GetRequestContext(), |
120 scoped_ptr<search_provider_logos::LogoDelegate>( | 120 scoped_ptr<search_provider_logos::LogoDelegate>( |
121 new ChromeLogoDelegate()))); | 121 new ChromeLogoDelegate()))); |
122 } | 122 } |
123 | 123 |
124 logo_tracker_->SetServerAPI( | 124 logo_tracker_->SetServerAPI( |
125 GetGoogleDoodleURL(profile_), | 125 GetGoogleDoodleURL(profile_), |
126 base::Bind(&search_provider_logos::GoogleParseLogoResponse), | 126 base::Bind(&search_provider_logos::GoogleParseLogoResponse), |
127 base::Bind(&search_provider_logos::GoogleAppendFingerprintToLogoURL)); | 127 base::Bind(&search_provider_logos::GoogleAppendQueryparamsToLogoURL), |
| 128 false); |
128 logo_tracker_->GetLogo(observer); | 129 logo_tracker_->GetLogo(observer); |
129 } | 130 } |
130 | 131 |
131 // LogoServiceFactory --------------------------------------------------------- | 132 // LogoServiceFactory --------------------------------------------------------- |
132 | 133 |
133 // static | 134 // static |
134 LogoService* LogoServiceFactory::GetForProfile(Profile* profile) { | 135 LogoService* LogoServiceFactory::GetForProfile(Profile* profile) { |
135 return static_cast<LogoService*>( | 136 return static_cast<LogoService*>( |
136 GetInstance()->GetServiceForBrowserContext(profile, true)); | 137 GetInstance()->GetServiceForBrowserContext(profile, true)); |
137 } | 138 } |
(...skipping 10 matching lines...) Expand all Loading... |
148 } | 149 } |
149 | 150 |
150 LogoServiceFactory::~LogoServiceFactory() {} | 151 LogoServiceFactory::~LogoServiceFactory() {} |
151 | 152 |
152 KeyedService* LogoServiceFactory::BuildServiceInstanceFor( | 153 KeyedService* LogoServiceFactory::BuildServiceInstanceFor( |
153 content::BrowserContext* context) const { | 154 content::BrowserContext* context) const { |
154 Profile* profile = static_cast<Profile*>(context); | 155 Profile* profile = static_cast<Profile*>(context); |
155 DCHECK(!profile->IsOffTheRecord()); | 156 DCHECK(!profile->IsOffTheRecord()); |
156 return new LogoService(profile); | 157 return new LogoService(profile); |
157 } | 158 } |
OLD | NEW |