Chromium Code Reviews| Index: chrome/browser/android/provider/chrome_browser_provider.cc |
| diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc |
| index 681aa8bd05c02bbd3a3677518cd6d83da88f4a65..a58c0e1eb7ab25d565fbd9b12e462adcfbdd78cd 100644 |
| --- a/chrome/browser/android/provider/chrome_browser_provider.cc |
| +++ b/chrome/browser/android/provider/chrome_browser_provider.cc |
| @@ -29,6 +29,7 @@ |
| #include "chrome/browser/history/android/sqlite_cursor.h" |
| #include "chrome/browser/history/history_service_factory.h" |
| #include "chrome/browser/history/top_sites.h" |
| +#include "chrome/browser/history/top_sites_factory.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/profiles/profile_manager.h" |
| #include "chrome/browser/search_engines/template_url_service_factory.h" |
| @@ -1165,7 +1166,7 @@ ChromeBrowserProvider::ChromeBrowserProvider(JNIEnv* env, jobject obj) |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| profile_ = g_browser_process->profile_manager()->GetLastUsedProfile(); |
| bookmark_model_ = BookmarkModelFactory::GetForProfile(profile_); |
| - top_sites_ = profile_->GetTopSites(); |
| + top_sites_ = TopSitesFactory::GetForProfile(profile_); |
| favicon_service_ = FaviconServiceFactory::GetForProfile( |
| profile_, Profile::EXPLICIT_ACCESS), |
| service_.reset(new AndroidHistoryProviderService(profile_)); |
| @@ -1574,7 +1575,7 @@ ScopedJavaLocalRef<jbyteArray> ChromeBrowserProvider::GetThumbnail( |
| // GetPageThumbnail is synchronous and can be called from any thread. |
| scoped_refptr<base::RefCountedMemory> thumbnail; |
| - if (top_sites_) |
| + if (top_sites_.get()) |
|
Bernhard Bauer
2015/01/08 10:22:04
Remove the .get().
Jitu( very slow this week)
2015/01/12 11:30:07
Done.
|
| top_sites_->GetPageThumbnail(url, false, &thumbnail); |
| if (!thumbnail.get() || !thumbnail->front()) { |