diff options
| author | hayato <hayato@chromium.org> | 2015-03-30 21:51:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-31 04:52:34 +0000 |
| commit | be13e67e49b90d6d60a69ef9cbc2dc080c3627d4 (patch) | |
| tree | 9c761afe2b1d1b944b2ed6f5ad15eafd8965e6c1 /chrome/browser/bookmarks | |
| parent | 85dcb7238c2cb32de9c834909a7c3a3e2f96dc77 (diff) | |
| download | chromium_src-be13e67e49b90d6d60a69ef9cbc2dc080c3627d4.zip chromium_src-be13e67e49b90d6d60a69ef9cbc2dc080c3627d4.tar.gz chromium_src-be13e67e49b90d6d60a69ef9cbc2dc080c3627d4.tar.bz2 | |
Revert of Revert of Move //components/favicon code into the favicon namespace (patchset #1 id:1 of https://codereview.chromium.org/1045823004/)
Reason for revert:
Not a culprit. Bring it back.
The layout tests continued to fail after reverting: https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac10.8%20(retina)/builds/27707
Original issue's description:
> Revert of Move //components/favicon code into the favicon namespace (patchset #4 id:80001 of https://codereview.chromium.org/1028503004/)
>
> Reason for revert:
> Blink gardening. Speculative revert for Blink layout test failures in WebKit Mac10.8 (retina):
> https://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac10.8%20%28retina%29/builds/27696
> chromium range: chromium revision 322799:322813
> https://chromium.googlesource.com/chromium/src/+log/494aec68691f10626b226892396d442503dd9af7%5E..e240ab4e9c5841de8cb65226a80008600416c365?pretty=fuller
>
> Original issue's description:
> > Move //components/favicon code into the favicon namespace
> >
> > Move all classes defined in //components/favicon into the favicon namespace
> > and update all client code forward-declaration and usage.
> >
> > Rename FaviconTabHelperObserver to FaviconDriverObserver as FaviconDriver is
> > the name of the base interface (and iOS wants to use that observer but will
> > not be able to use FaviconTabHelper).
> >
> > BUG=359513
> >
> > Committed: https://crrev.com/494aec68691f10626b226892396d442503dd9af7
> > Cr-Commit-Position: refs/heads/master@{#322799}
>
> TBR=sky@chromium.org,sdefresne@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=359513
>
> Committed: https://crrev.com/c7c707f533da81e7c7d5c2201426ae60e4a0daf7
> Cr-Commit-Position: refs/heads/master@{#322969}
TBR=sky@chromium.org,sdefresne@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=359513
Review URL: https://codereview.chromium.org/1043743003
Cr-Commit-Position: refs/heads/master@{#322980}
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/chrome_bookmark_client.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index c5e30e8..aeba2a8 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -458,8 +458,9 @@ bool BookmarkFaviconFetcher::FetchNextFavicon() { // Filter out urls that we've already got favicon for. URLFaviconMap::const_iterator iter = favicons_map_->find(url); if (favicons_map_->end() == iter) { - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - profile_, ServiceAccessType::EXPLICIT_ACCESS); + favicon::FaviconService* favicon_service = + FaviconServiceFactory::GetForProfile( + profile_, ServiceAccessType::EXPLICIT_ACCESS); favicon_service->GetRawFaviconForPageURL( GURL(url), favicon_base::FAVICON, diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc index b319648..82f3da9 100644 --- a/chrome/browser/bookmarks/chrome_bookmark_client.cc +++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc @@ -114,8 +114,9 @@ ChromeBookmarkClient::GetFaviconImageForPageURL( favicon_base::IconType type, const favicon_base::FaviconImageCallback& callback, base::CancelableTaskTracker* tracker) { - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - profile_, ServiceAccessType::EXPLICIT_ACCESS); + favicon::FaviconService* favicon_service = + FaviconServiceFactory::GetForProfile(profile_, + ServiceAccessType::EXPLICIT_ACCESS); if (!favicon_service) return base::CancelableTaskTracker::kBadTaskId; if (type == favicon_base::FAVICON) { |