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

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

Issue 835903005: [Favicon] Add new fallback icon rendering flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Getting code to work again after merge. Created 5 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/fallback_icon_source.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/history/top_sites_factory.h" 8 #include "chrome/browser/history/top_sites_factory.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/search/instant_io_context.h" 10 #include "chrome/browser/search/instant_io_context.h"
11 #include "chrome/browser/search/instant_service_observer.h" 11 #include "chrome/browser/search/instant_service_observer.h"
12 #include "chrome/browser/search/most_visited_iframe_source.h" 12 #include "chrome/browser/search/most_visited_iframe_source.h"
13 #include "chrome/browser/search/search.h" 13 #include "chrome/browser/search/search.h"
14 #include "chrome/browser/search/suggestions/suggestions_source.h" 14 #include "chrome/browser/search/suggestions/suggestions_source.h"
15 #include "chrome/browser/search_engines/template_url_service_factory.h" 15 #include "chrome/browser/search_engines/template_url_service_factory.h"
16 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" 16 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
17 #include "chrome/browser/themes/theme_properties.h" 17 #include "chrome/browser/themes/theme_properties.h"
18 #include "chrome/browser/themes/theme_service.h" 18 #include "chrome/browser/themes/theme_service.h"
19 #include "chrome/browser/themes/theme_service_factory.h" 19 #include "chrome/browser/themes/theme_service_factory.h"
20 #include "chrome/browser/thumbnails/thumbnail_list_source.h" 20 #include "chrome/browser/thumbnails/thumbnail_list_source.h"
21 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 21 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
22 #include "chrome/browser/ui/webui/fallback_icon_source.h"
22 #include "chrome/browser/ui/webui/favicon_source.h" 23 #include "chrome/browser/ui/webui/favicon_source.h"
23 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h" 24 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
24 #include "chrome/browser/ui/webui/theme_source.h" 25 #include "chrome/browser/ui/webui/theme_source.h"
25 #include "chrome/common/render_messages.h" 26 #include "chrome/common/render_messages.h"
26 #include "components/history/core/browser/top_sites.h" 27 #include "components/history/core/browser/top_sites.h"
27 #include "components/search_engines/template_url_service.h" 28 #include "components/search_engines/template_url_service.h"
28 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
29 #include "content/public/browser/notification_service.h" 30 #include "content/public/browser/notification_service.h"
30 #include "content/public/browser/notification_types.h" 31 #include "content/public/browser/notification_types.h"
31 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 118
118 // TODO(aurimas) remove this #if once instant_service.cc is no longer compiled 119 // TODO(aurimas) remove this #if once instant_service.cc is no longer compiled
119 // on Android. 120 // on Android.
120 #if !defined(OS_ANDROID) 121 #if !defined(OS_ANDROID)
121 content::URLDataSource::Add(profile_, new LocalNtpSource(profile_)); 122 content::URLDataSource::Add(profile_, new LocalNtpSource(profile_));
122 content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, false)); 123 content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, false));
123 content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, true)); 124 content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, true));
124 content::URLDataSource::Add(profile_, new ThumbnailListSource(profile_)); 125 content::URLDataSource::Add(profile_, new ThumbnailListSource(profile_));
125 #endif // !defined(OS_ANDROID) 126 #endif // !defined(OS_ANDROID)
126 127
128 content::URLDataSource::Add(profile_, new FallbackIconSource());
127 content::URLDataSource::Add( 129 content::URLDataSource::Add(
128 profile_, new FaviconSource(profile_, FaviconSource::FAVICON)); 130 profile_, new FaviconSource(profile_, FaviconSource::FAVICON));
129 content::URLDataSource::Add(profile_, new MostVisitedIframeSource()); 131 content::URLDataSource::Add(profile_, new MostVisitedIframeSource());
130 content::URLDataSource::Add( 132 content::URLDataSource::Add(
131 profile_, new suggestions::SuggestionsSource(profile_)); 133 profile_, new suggestions::SuggestionsSource(profile_));
132 } 134 }
133 135
134 InstantService::~InstantService() { 136 InstantService::~InstantService() {
135 if (template_url_service_) 137 if (template_url_service_)
136 template_url_service_->RemoveObserver(this); 138 template_url_service_->RemoveObserver(this);
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 } 437 }
436 438
437 void InstantService::ResetInstantSearchPrerenderer() { 439 void InstantService::ResetInstantSearchPrerenderer() {
438 if (!chrome::ShouldPrefetchSearchResults()) 440 if (!chrome::ShouldPrefetchSearchResults())
439 return; 441 return;
440 442
441 GURL url(chrome::GetSearchResultPrefetchBaseURL(profile_)); 443 GURL url(chrome::GetSearchResultPrefetchBaseURL(profile_));
442 instant_prerenderer_.reset( 444 instant_prerenderer_.reset(
443 url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : NULL); 445 url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : NULL);
444 } 446 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/fallback_icon_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698