diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 05:11:04 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 05:11:04 +0000 |
| commit | 52f87ce9586b710d810b1781e63bb8c957387db1 (patch) | |
| tree | 2916c9e560c77428abf2cc0b88240ddd0fb3168a | |
| parent | 8576d3230816c35b6e6b571a43b77d7270ff445e (diff) | |
| download | chromium_src-52f87ce9586b710d810b1781e63bb8c957387db1.zip chromium_src-52f87ce9586b710d810b1781e63bb8c957387db1.tar.gz chromium_src-52f87ce9586b710d810b1781e63bb8c957387db1.tar.bz2 | |
fix top sites compile breakage from patch conflict
BUG=none
TEST=none
TBR=rsleevi
Review URL: http://codereview.chromium.org/8390038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107300 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/history/top_sites_extension_api.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/history/top_sites_extension_api.cc b/chrome/browser/history/top_sites_extension_api.cc index 545164d..6a8c4b2 100644 --- a/chrome/browser/history/top_sites_extension_api.cc +++ b/chrome/browser/history/top_sites_extension_api.cc @@ -43,16 +43,7 @@ void GetTopSitesFunction::OnMostVisitedURLsAvailable( NewTabUI::SetURLTitleAndDirection(page_value, url.title, url.url); - if (!url.favicon_url.is_empty()) - page_value->SetString("faviconUrl", url.favicon_url.spec()); - // In MostVisitedHandler, there's special code here for the - // prepopulated thumbnails, but we can't replicate it here conveniently. - // TODO(estade) Do something else instead. - - history::TopSites* ts = profile()->GetTopSites(); - if (ts && ts->IsURLPinned(url.url)) - page_value->SetBoolean("pinned", true); pages_value->Append(page_value); } // End copied code. ---------------------------------------------------------- |