summaryrefslogtreecommitdiffstats
path: root/components/history.gypi
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-01-29 10:26:35 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-29 18:27:36 +0000
commit0da3bc0e26f768834feca7a5e1c0c70f4c88e453 (patch)
tree0ae22751196e3341688dadded537b6974a4d7932 /components/history.gypi
parent1838a81f74e6ef7a6cc9296bfec20ea1f0ff97a1 (diff)
downloadchromium_src-0da3bc0e26f768834feca7a5e1c0c70f4c88e453.zip
chromium_src-0da3bc0e26f768834feca7a5e1c0c70f4c88e453.tar.gz
chromium_src-0da3bc0e26f768834feca7a5e1c0c70f4c88e453.tar.bz2
Componentize TopSites, TopSitesBackend, TopSitesDatabase
TopSites prepopulated pages are not injected by the embedder via the TopSitesFactory. The method TopSites::GetPrepopulatedSites() now does return the sites favicon, thumbnail and color in addition to the URL and title. TopSitesImplTest now can inject prepopulated pages to the TopSitesImpl thus enabling the test TopSitesImplTest.BlacklistingWithPrepopulated on Android. Change TopSites so that it does not inherit from content::NotificationObserver as it does not need to listen to notification and move the inheritance to TopSitesImpl (until the code is changed to use observer pattern instead of notifications). Remove dependency of TopSitesBackend on content::BrowserThread by injecting a base::SingleThreadedTaskRunner reference to the corresponding thread via the TopSitesImpl::Init() method. Introduce //components/test/data/history and move pristine SQL files used by the different unit tests there, helping remove dependency of the unit tests on //chrome. Move top_sites.{cc,h}, top_sites_database.{cc,h} into //components/history/core/browser. BUG=380144, 380157 TBR=sky, dgozman, samarth Review URL: https://codereview.chromium.org/870063002 Cr-Commit-Position: refs/heads/master@{#313740}
Diffstat (limited to 'components/history.gypi')
-rw-r--r--components/history.gypi9
1 files changed, 9 insertions, 0 deletions
diff --git a/components/history.gypi b/components/history.gypi
index 11976bc..7c1a57c 100644
--- a/components/history.gypi
+++ b/components/history.gypi
@@ -14,6 +14,7 @@
'dependencies': [
'../base/base.gyp:base',
'../net/net.gyp:net',
+ '../skia/skia.gyp:skia',
'../sql/sql.gyp:sql',
'../third_party/sqlite/sqlite.gyp:sqlite',
'../ui/base/ui_base.gyp:ui_base',
@@ -63,8 +64,14 @@
'history/core/browser/page_usage_data.h',
'history/core/browser/thumbnail_database.cc',
'history/core/browser/thumbnail_database.h',
+ 'history/core/browser/top_sites.cc',
+ 'history/core/browser/top_sites.h',
+ 'history/core/browser/top_sites_backend.cc',
+ 'history/core/browser/top_sites_backend.h',
'history/core/browser/top_sites_cache.cc',
'history/core/browser/top_sites_cache.h',
+ 'history/core/browser/top_sites_database.cc',
+ 'history/core/browser/top_sites_database.h',
'history/core/browser/top_sites_observer.h',
'history/core/browser/url_database.cc',
'history/core/browser/url_database.h',
@@ -152,6 +159,8 @@
],
'sources': [
# Note: sources list duplicated in GN build.
+ 'history/core/test/database_test_utils.cc',
+ 'history/core/test/database_test_utils.h',
'history/core/test/history_client_fake_bookmarks.cc',
'history/core/test/history_client_fake_bookmarks.h',
'history/core/test/history_unittest_base.cc',