| 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 "ios/chrome/browser/google/google_logo_service.h" | 5 #include "ios/chrome/browser/google/google_logo_service.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/strings/sys_string_conversions.h" | 10 #include "base/strings/sys_string_conversions.h" |
| 11 #include "base/threading/sequenced_worker_pool.h" |
| 11 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
| 12 #include "components/search_engines/template_url_service.h" | 13 #include "components/search_engines/template_url_service.h" |
| 13 #include "components/search_provider_logos/google_logo_api.h" | 14 #include "components/search_provider_logos/google_logo_api.h" |
| 14 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 15 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
| 15 #include "ios/chrome/browser/search_engines/template_url_service_factory.h" | 16 #include "ios/chrome/browser/search_engines/template_url_service_factory.h" |
| 16 #include "ios/chrome/browser/search_engines/ui_thread_search_terms_data.h" | 17 #include "ios/chrome/browser/search_engines/ui_thread_search_terms_data.h" |
| 17 #include "ios/web/public/web_thread.h" | 18 #include "ios/web/public/web_thread.h" |
| 18 #include "net/url_request/url_request_context_getter.h" | 19 #include "net/url_request/url_request_context_getter.h" |
| 19 #include "ui/gfx/image/image.h" | 20 #include "ui/gfx/image/image.h" |
| 20 | 21 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 cached_metadata_ = empty_metadata; | 127 cached_metadata_ = empty_metadata; |
| 127 } | 128 } |
| 128 } | 129 } |
| 129 | 130 |
| 130 search_provider_logos::Logo GoogleLogoService::GetCachedLogo() { | 131 search_provider_logos::Logo GoogleLogoService::GetCachedLogo() { |
| 131 search_provider_logos::Logo logo; | 132 search_provider_logos::Logo logo; |
| 132 logo.image = cached_image_; | 133 logo.image = cached_image_; |
| 133 logo.metadata = cached_metadata_; | 134 logo.metadata = cached_metadata_; |
| 134 return logo; | 135 return logo; |
| 135 } | 136 } |
| OLD | NEW |