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

Unified Diff: chrome/browser/history/top_sites_factory.cc

Issue 870063002: Componentize TopSites, TopSitesBackend, TopSitesDatabase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@815983002
Patch Set: Fix typo Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/history/top_sites_factory.h ('k') | chrome/browser/history/top_sites_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/top_sites_factory.cc
diff --git a/chrome/browser/history/top_sites_factory.cc b/chrome/browser/history/top_sites_factory.cc
index b0e77b55ee94eb28289c986fa513eafb6cd28dba..a2a7db2c3d2d20996dfc9dd9ea66a15a9bf1e5fc 100644
--- a/chrome/browser/history/top_sites_factory.cc
+++ b/chrome/browser/history/top_sites_factory.cc
@@ -4,11 +4,67 @@
#include "chrome/browser/history/top_sites_factory.h"
+#include "base/macros.h"
#include "base/memory/singleton.h"
#include "chrome/browser/history/top_sites_impl.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_constants.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
+#include "chrome/grit/locale_settings.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "content/public/browser/browser_thread.h"
+#include "grit/theme_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "url/gurl.h"
+
+namespace {
+
+struct RawPrepopulatedPage {
+ int url_id; // The resource for the page URL.
+ int title_id; // The resource for the page title.
+ int favicon_id; // The raw data resource for the favicon.
+ int thumbnail_id; // The raw data resource for the thumbnail.
+ SkColor color; // The best color to highlight the page (should roughly
+ // match favicon).
+};
+
+#if !defined(OS_ANDROID)
+// Android does not use prepopulated pages.
+const RawPrepopulatedPage kRawPrepopulatedPages[] = {
+ {
+ IDS_CHROME_WELCOME_URL,
+ IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE,
+ IDR_PRODUCT_LOGO_16,
+ IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL,
+ SkColorSetRGB(0, 147, 60),
+ },
+ {
+ IDS_WEBSTORE_URL,
+ IDS_EXTENSION_WEB_STORE_TITLE,
+ IDR_WEBSTORE_ICON_16,
+ IDR_NEWTAB_WEBSTORE_THUMBNAIL,
+ SkColorSetRGB(63, 132, 197),
+ },
+};
+#endif
+
+void InitializePrepopulatedPageList(
+ history::PrepopulatedPageList* prepopulated_pages) {
+#if !defined(OS_ANDROID)
+ DCHECK(prepopulated_pages);
+ prepopulated_pages->reserve(arraysize(kRawPrepopulatedPages));
+ for (size_t i = 0; i < arraysize(kRawPrepopulatedPages); ++i) {
+ const RawPrepopulatedPage& page = kRawPrepopulatedPages[i];
+ prepopulated_pages->push_back(history::PrepopulatedPage(
+ GURL(l10n_util::GetStringUTF8(page.url_id)),
+ l10n_util::GetStringUTF16(page.title_id), page.favicon_id,
+ page.thumbnail_id, page.color));
+ }
+#endif
+}
+
+} // namespace
// static
scoped_refptr<history::TopSites> TopSitesFactory::GetForProfile(
@@ -40,9 +96,14 @@ TopSitesFactory::~TopSitesFactory() {
scoped_refptr<RefcountedKeyedService> TopSitesFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
- history::TopSitesImpl* top_sites =
- new history::TopSitesImpl(static_cast<Profile*>(context));
- top_sites->Init(context->GetPath().Append(chrome::kTopSitesFilename));
+ history::PrepopulatedPageList prepopulated_pages;
+ InitializePrepopulatedPageList(&prepopulated_pages);
+
+ history::TopSitesImpl* top_sites = new history::TopSitesImpl(
+ static_cast<Profile*>(context), prepopulated_pages);
+ top_sites->Init(context->GetPath().Append(chrome::kTopSitesFilename),
+ content::BrowserThread::GetMessageLoopProxyForThread(
+ content::BrowserThread::DB));
return make_scoped_refptr(top_sites);
}
« no previous file with comments | « chrome/browser/history/top_sites_factory.h ('k') | chrome/browser/history/top_sites_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698