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

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

Issue 996253002: [Fallback Icons] Refactor FallbackIconService to be a BrowserContext-level singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 // 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
120 // on Android. 120 // on Android.
121 #if !defined(OS_ANDROID) 121 #if !defined(OS_ANDROID)
122 content::URLDataSource::Add(profile_, new LocalNtpSource(profile_)); 122 content::URLDataSource::Add(profile_, new LocalNtpSource(profile_));
123 content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, false)); 123 content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, false));
124 content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, true)); 124 content::URLDataSource::Add(profile_, new ThumbnailSource(profile_, true));
125 content::URLDataSource::Add(profile_, new ThumbnailListSource(profile_)); 125 content::URLDataSource::Add(profile_, new ThumbnailListSource(profile_));
126 #endif // !defined(OS_ANDROID) 126 #endif // !defined(OS_ANDROID)
127 127
128 content::URLDataSource::Add(profile_, new FallbackIconSource()); 128 content::URLDataSource::Add(profile_, new FallbackIconSource(profile_));
129 content::URLDataSource::Add( 129 content::URLDataSource::Add(
130 profile_, new FaviconSource(profile_, FaviconSource::FAVICON)); 130 profile_, new FaviconSource(profile_, FaviconSource::FAVICON));
131 content::URLDataSource::Add(profile_, new MostVisitedIframeSource()); 131 content::URLDataSource::Add(profile_, new MostVisitedIframeSource());
132 content::URLDataSource::Add( 132 content::URLDataSource::Add(
133 profile_, new suggestions::SuggestionsSource(profile_)); 133 profile_, new suggestions::SuggestionsSource(profile_));
134 } 134 }
135 135
136 InstantService::~InstantService() { 136 InstantService::~InstantService() {
137 if (template_url_service_) 137 if (template_url_service_)
138 template_url_service_->RemoveObserver(this); 138 template_url_service_->RemoveObserver(this);
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 } 437 }
438 438
439 void InstantService::ResetInstantSearchPrerenderer() { 439 void InstantService::ResetInstantSearchPrerenderer() {
440 if (!chrome::ShouldPrefetchSearchResults()) 440 if (!chrome::ShouldPrefetchSearchResults())
441 return; 441 return;
442 442
443 GURL url(chrome::GetSearchResultPrefetchBaseURL(profile_)); 443 GURL url(chrome::GetSearchResultPrefetchBaseURL(profile_));
444 instant_prerenderer_.reset( 444 instant_prerenderer_.reset(
445 url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : NULL); 445 url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : NULL);
446 } 446 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698