diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 19:02:06 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 19:02:06 +0000 |
| commit | edbf0992afe2412751a122317c55348c89fe4be3 (patch) | |
| tree | bf96874fd9459751bc30407a2159a11fea1ee64a /chrome | |
| parent | f2c5aad3acb3f1b2afaca4c98dd29ac1320b43dd (diff) | |
| download | chromium_src-edbf0992afe2412751a122317c55348c89fe4be3.zip chromium_src-edbf0992afe2412751a122317c55348c89fe4be3.tar.gz chromium_src-edbf0992afe2412751a122317c55348c89fe4be3.tar.bz2 | |
Revert "Make sure TopSites is only created if enabled. TopSites was getting"
This reverts commit r61790. It may have broken Vista Tests (dbg)(1)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/dom_ui/most_visited_handler.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/history/history.cc | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc index 671cdb9..95d326f 100644 --- a/chrome/browser/dom_ui/most_visited_handler.cc +++ b/chrome/browser/dom_ui/most_visited_handler.cc @@ -132,17 +132,13 @@ void MostVisitedHandler::HandleGetMostVisited(const ListValue* args) { void MostVisitedHandler::SendPagesValue() { if (pages_value_.get()) { - bool has_blacklisted_urls = !url_blacklist_->empty(); - if (history::TopSites::IsEnabled()) { - history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); - has_blacklisted_urls = ts->HasBlacklistedItems(); - } + history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites(); FundamentalValue first_run(IsFirstRun()); - FundamentalValue has_blacklisted_urls_value(has_blacklisted_urls); + FundamentalValue has_blacklisted_urls(ts->HasBlacklistedItems()); dom_ui_->CallJavascriptFunction(L"mostVisitedPages", *(pages_value_.get()), first_run, - has_blacklisted_urls_value); + has_blacklisted_urls); pages_value_.reset(); } } diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index 3be6ad9..d70fd85 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -764,10 +764,8 @@ void HistoryService::OnDBLoaded() { } void HistoryService::StartTopSitesMigration() { - if (history::TopSites::IsEnabled()) { - history::TopSites* ts = profile_->GetTopSites(); - ts->StartMigration(); - } + history::TopSites* ts = profile_->GetTopSites(); + ts->StartMigration(); } void HistoryService::OnTopSitesReady() { |