diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-03-30 10:17:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-30 17:18:00 +0000 |
| commit | 494aec68691f10626b226892396d442503dd9af7 (patch) | |
| tree | 3cf53649ec6e4c708d419928ca798b5bc6641dee /chrome/browser/bookmarks | |
| parent | 24c5e71f6cc5f1033485d83bd7d767c45071cf16 (diff) | |
| download | chromium_src-494aec68691f10626b226892396d442503dd9af7.zip chromium_src-494aec68691f10626b226892396d442503dd9af7.tar.gz chromium_src-494aec68691f10626b226892396d442503dd9af7.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1028503004
Cr-Commit-Position: refs/heads/master@{#322799}
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) { |