Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: chrome/browser/search/instant_service.cc

Issue 2660883002: Introduce a Doodle Fetcher for NTP (Closed)
Patch Set: Tests work. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/search/instant_service.h" 5 #include "chrome/browser/search/instant_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string>
9 #include <utility>
8 10
9 #include "base/bind.h" 11 #include "base/bind.h"
10 #include "base/feature_list.h" 12 #include "base/feature_list.h"
11 #include "build/build_config.h" 13 #include "build/build_config.h"
12 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/favicon/fallback_icon_service_factory.h" 15 #include "chrome/browser/favicon/fallback_icon_service_factory.h"
14 #include "chrome/browser/favicon/favicon_service_factory.h" 16 #include "chrome/browser/favicon/favicon_service_factory.h"
15 #include "chrome/browser/favicon/large_icon_service_factory.h" 17 #include "chrome/browser/favicon/large_icon_service_factory.h"
16 #include "chrome/browser/history/top_sites_factory.h" 18 #include "chrome/browser/history/top_sites_factory.h"
17 #include "chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.h" 19 #include "chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.h"
18 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/search/instant_io_context.h" 21 #include "chrome/browser/search/instant_io_context.h"
20 #include "chrome/browser/search/instant_service_observer.h" 22 #include "chrome/browser/search/instant_service_observer.h"
21 #include "chrome/browser/search/most_visited_iframe_source.h" 23 #include "chrome/browser/search/most_visited_iframe_source.h"
22 #include "chrome/browser/search/search.h" 24 #include "chrome/browser/search/search.h"
23 #include "chrome/browser/search/suggestions/image_decoder_impl.h" 25 #include "chrome/browser/search/suggestions/image_decoder_impl.h"
24 #include "chrome/browser/search/suggestions/suggestions_service_factory.h" 26 #include "chrome/browser/search/suggestions/suggestions_service_factory.h"
25 #include "chrome/browser/search/thumbnail_source.h" 27 #include "chrome/browser/search/thumbnail_source.h"
26 #include "chrome/browser/search_engines/template_url_service_factory.h" 28 #include "chrome/browser/search_engines/template_url_service_factory.h"
27 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" 29 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
28 #include "chrome/browser/thumbnails/thumbnail_list_source.h" 30 #include "chrome/browser/thumbnails/thumbnail_list_source.h"
29 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 31 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
30 #include "chrome/browser/ui/webui/fallback_icon_source.h" 32 #include "chrome/browser/ui/webui/fallback_icon_source.h"
31 #include "chrome/browser/ui/webui/favicon_source.h" 33 #include "chrome/browser/ui/webui/favicon_source.h"
32 #include "chrome/browser/ui/webui/large_icon_source.h" 34 #include "chrome/browser/ui/webui/large_icon_source.h"
33 #include "chrome/browser/ui/webui/theme_source.h" 35 #include "chrome/browser/ui/webui/theme_source.h"
34 #include "chrome/common/render_messages.h" 36 #include "chrome/common/render_messages.h"
35 #include "chrome/grit/theme_resources.h" 37 #include "chrome/grit/theme_resources.h"
38 #include "components/doodle/doodle_fetcher.h"
36 #include "components/favicon/core/fallback_icon_service.h" 39 #include "components/favicon/core/fallback_icon_service.h"
37 #include "components/favicon/core/large_icon_service.h" 40 #include "components/favicon/core/large_icon_service.h"
38 #include "components/history/core/browser/top_sites.h" 41 #include "components/history/core/browser/top_sites.h"
39 #include "components/image_fetcher/image_fetcher_impl.h" 42 #include "components/image_fetcher/image_fetcher_impl.h"
40 #include "components/keyed_service/core/service_access_type.h" 43 #include "components/keyed_service/core/service_access_type.h"
41 #include "components/ntp_tiles/icon_cacher.h" 44 #include "components/ntp_tiles/icon_cacher.h"
42 #include "components/search/search.h" 45 #include "components/search/search.h"
43 #include "components/search_engines/template_url_service.h" 46 #include "components/search_engines/template_url_service.h"
44 #include "content/public/browser/browser_thread.h" 47 #include "content/public/browser/browser_thread.h"
45 #include "content/public/browser/notification_service.h" 48 #include "content/public/browser/notification_service.h"
46 #include "content/public/browser/notification_types.h" 49 #include "content/public/browser/notification_types.h"
47 #include "content/public/browser/render_process_host.h" 50 #include "content/public/browser/render_process_host.h"
48 #include "content/public/browser/url_data_source.h" 51 #include "content/public/browser/url_data_source.h"
49 #include "third_party/skia/include/core/SkColor.h" 52 #include "third_party/skia/include/core/SkColor.h"
50 #include "ui/gfx/color_utils.h" 53 #include "ui/gfx/color_utils.h"
51 #include "ui/gfx/image/image_skia.h" 54 #include "ui/gfx/image/image_skia.h"
52 55
53 #if !defined(OS_ANDROID) 56 #if !defined(OS_ANDROID)
54 #include "chrome/browser/search/local_ntp_source.h" 57 #include "chrome/browser/search/local_ntp_source.h"
55 #include "chrome/browser/themes/theme_properties.h" 58 #include "chrome/browser/themes/theme_properties.h"
56 #include "chrome/browser/themes/theme_service.h" 59 #include "chrome/browser/themes/theme_service.h"
57 #include "chrome/browser/themes/theme_service_factory.h" 60 #include "chrome/browser/themes/theme_service_factory.h"
58 #endif 61 #endif
59 62
63 using doodle::DoodleState;
64 using doodle::DoodleFetcher;
65 using doodle::DoodleConfig;
66
60 namespace { 67 namespace {
61 68
62 const base::Feature kNtpTilesFeature{"NTPTilesInInstantService", 69 const base::Feature kNtpTilesFeature{"NTPTilesInInstantService",
63 base::FEATURE_DISABLED_BY_DEFAULT}; 70 base::FEATURE_DISABLED_BY_DEFAULT};
64 71
65 } // namespace 72 } // namespace
66 73
67 InstantService::InstantService(Profile* profile) 74 InstantService::InstantService(Profile* profile)
68 : profile_(profile), 75 : profile_(profile),
69 template_url_service_(TemplateURLServiceFactory::GetForProfile(profile_)), 76 template_url_service_(TemplateURLServiceFactory::GetForProfile(profile_)),
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 FallbackIconServiceFactory::GetForBrowserContext(profile_); 148 FallbackIconServiceFactory::GetForBrowserContext(profile_);
142 favicon::LargeIconService* large_icon_service = 149 favicon::LargeIconService* large_icon_service =
143 LargeIconServiceFactory::GetForBrowserContext(profile_); 150 LargeIconServiceFactory::GetForBrowserContext(profile_);
144 content::URLDataSource::Add( 151 content::URLDataSource::Add(
145 profile_, new FallbackIconSource(fallback_icon_service)); 152 profile_, new FallbackIconSource(fallback_icon_service));
146 content::URLDataSource::Add( 153 content::URLDataSource::Add(
147 profile_, new FaviconSource(profile_, FaviconSource::FAVICON)); 154 profile_, new FaviconSource(profile_, FaviconSource::FAVICON));
148 content::URLDataSource::Add( 155 content::URLDataSource::Add(
149 profile_, new LargeIconSource(fallback_icon_service, large_icon_service)); 156 profile_, new LargeIconSource(fallback_icon_service, large_icon_service));
150 content::URLDataSource::Add(profile_, new MostVisitedIframeSource()); 157 content::URLDataSource::Add(profile_, new MostVisitedIframeSource());
158
159 doodle_fetcher_ = base::MakeUnique<DoodleFetcher>(
160 profile_->GetRequestContext(),
161 GURL(UIThreadSearchTermsData(profile_).GoogleBaseURLValue()));
162 doodle_fetcher_->FetchDoodle(base::Bind([](const DoodleConfig& config) {
163 if (config.state != DoodleState::AVAILABLE) {
164 LOG(ERROR) << "DEBUG DoodleFetcher: Doodle wasn't fetched.";
165 return;
166 }
167 LOG(ERROR)
168 << "DEBUG DoodleFetcher: Fetching and parsing the JSON succeeded.";
169 LOG(ERROR) << "DEBUG DoodleFetcher: config.TTL(ms)="
170 << config.time_to_live_ms;
171 LOG(ERROR) << "DEBUG DoodleFetcher: config.doodle_type="
172 << config.doodle_type;
173 LOG(ERROR) << "DEBUG DoodleFetcher: config.search_url="
174 << config.search_url.spec();
175 LOG(ERROR) << "DEBUG DoodleFetcher: config.large_image.url="
176 << config.large_image.url.spec();
177 LOG(ERROR) << "DEBUG DoodleFetcher: config.large_image.width="
178 << config.large_image.width;
179 }));
151 } 180 }
152 181
153 InstantService::~InstantService() { 182 InstantService::~InstantService() {
154 if (template_url_service_) 183 if (template_url_service_)
155 template_url_service_->RemoveObserver(this); 184 template_url_service_->RemoveObserver(this);
156 } 185 }
157 186
158 void InstantService::AddInstantProcess(int process_id) { 187 void InstantService::AddInstantProcess(int process_id) {
159 process_ids_.insert(process_id); 188 process_ids_.insert(process_id);
160 189
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 void InstantService::ResetInstantSearchPrerendererIfNecessary() { 533 void InstantService::ResetInstantSearchPrerendererIfNecessary() {
505 if (!search::IsInstantExtendedAPIEnabled()) 534 if (!search::IsInstantExtendedAPIEnabled())
506 return; 535 return;
507 536
508 GURL url(search::GetSearchResultPrefetchBaseURL(profile_)); 537 GURL url(search::GetSearchResultPrefetchBaseURL(profile_));
509 if (!instant_prerenderer_ || instant_prerenderer_->prerender_url() != url) { 538 if (!instant_prerenderer_ || instant_prerenderer_->prerender_url() != url) {
510 instant_prerenderer_.reset( 539 instant_prerenderer_.reset(
511 url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : nullptr); 540 url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : nullptr);
512 } 541 }
513 } 542 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698