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 "base/thread_task_runner_handle.h" |
8 #include "chrome/browser/image_decoder.h" | 9 #include "chrome/browser/image_decoder.h" |
9 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/search_engines/template_url_service_factory.h" | 11 #include "chrome/browser/search_engines/template_url_service_factory.h" |
11 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" | 12 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" |
12 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 13 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
13 #include "components/search_engines/template_url_service.h" | 14 #include "components/search_engines/template_url_service.h" |
14 #include "components/search_provider_logos/google_logo_api.h" | 15 #include "components/search_provider_logos/google_logo_api.h" |
15 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
16 #include "net/url_request/url_request_context_getter.h" | 17 #include "net/url_request/url_request_context_getter.h" |
17 | 18 |
(...skipping 20 matching lines...) Expand all Loading... |
38 | 39 |
39 class LogoDecoderDelegate : public ImageDecoder::ImageRequest { | 40 class LogoDecoderDelegate : public ImageDecoder::ImageRequest { |
40 public: | 41 public: |
41 LogoDecoderDelegate( | 42 LogoDecoderDelegate( |
42 const base::Callback<void(const SkBitmap&)>& image_decoded_callback) | 43 const base::Callback<void(const SkBitmap&)>& image_decoded_callback) |
43 : image_decoded_callback_(image_decoded_callback), | 44 : image_decoded_callback_(image_decoded_callback), |
44 weak_ptr_factory_(this) { | 45 weak_ptr_factory_(this) { |
45 // If the ImageDecoder crashes or otherwise never completes, call | 46 // If the ImageDecoder crashes or otherwise never completes, call |
46 // OnImageDecodeTimedOut() eventually to ensure that image_decoded_callback_ | 47 // OnImageDecodeTimedOut() eventually to ensure that image_decoded_callback_ |
47 // is run. | 48 // is run. |
48 base::MessageLoopProxy::current()->PostDelayedTask( | 49 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( |
49 FROM_HERE, base::Bind(&LogoDecoderDelegate::OnDecodeImageFailed, | 50 FROM_HERE, base::Bind(&LogoDecoderDelegate::OnDecodeImageFailed, |
50 weak_ptr_factory_.GetWeakPtr()), | 51 weak_ptr_factory_.GetWeakPtr()), |
51 base::TimeDelta::FromSeconds(kDecodeLogoTimeoutSeconds)); | 52 base::TimeDelta::FromSeconds(kDecodeLogoTimeoutSeconds)); |
52 } | 53 } |
53 | 54 |
54 ~LogoDecoderDelegate() override {} | 55 ~LogoDecoderDelegate() override {} |
55 | 56 |
56 // ImageDecoder::ImageRequest: | 57 // ImageDecoder::ImageRequest: |
57 void OnImageDecoded(const SkBitmap& decoded_image) override { | 58 void OnImageDecoded(const SkBitmap& decoded_image) override { |
58 image_decoded_callback_.Run(decoded_image); | 59 image_decoded_callback_.Run(decoded_image); |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after 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 |