| Index: content/public/browser/favicon_download_delegate.h
|
| diff --git a/chrome/browser/favicon/favicon_download_helper_delegate.h b/content/public/browser/favicon_download_delegate.h
|
| similarity index 51%
|
| copy from chrome/browser/favicon/favicon_download_helper_delegate.h
|
| copy to content/public/browser/favicon_download_delegate.h
|
| index ebdb5c2db312ecf82c4e795c3e94e837279504ba..29eb07c26858f93a04180dd1e626f2c1c318a883 100644
|
| --- a/chrome/browser/favicon/favicon_download_helper_delegate.h
|
| +++ b/content/public/browser/favicon_download_delegate.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_FAVICON_FAVICON_DOWNLOAD_HELPER_DELEGATE_H_
|
| -#define CHROME_BROWSER_FAVICON_FAVICON_DOWNLOAD_HELPER_DELEGATE_H_
|
| +#ifndef CONTENT_PUBLIC_BROWSER_FAVICON_DOWNLOAD_DELEGATE_H_
|
| +#define CONTENT_PUBLIC_BROWSER_FAVICON_DOWNLOAD_DELEGATE_H_
|
|
|
| #include <vector>
|
|
|
| @@ -11,28 +11,35 @@
|
|
|
| class GURL;
|
| class SkBitmap;
|
| +
|
| +namespace content {
|
| struct FaviconURL;
|
| +}
|
| +
|
| +namespace content {
|
|
|
| -// This class provides a delegate interface for a FaviconDownloadHelper. It
|
| -// allows the FaviconDownloadHelper to pass favicon data back to its caller.
|
| -class FaviconDownloadHelperDelegate {
|
| +// This class provides a delegate interface for a Favicon Download requests. It
|
| +// allows WebContents to pass favicon data back to its caller.
|
| +class FaviconDownloadDelegate {
|
| public:
|
| // Called when the icon at |image_url| has been downloaded.
|
| // |bitmaps| is a list of all the frames of the icon at |image_url|.
|
| - virtual void OnDidDownloadFavicon(
|
| + virtual void DidDownloadFavicon(
|
| int id,
|
| const GURL& image_url,
|
| bool errored,
|
| int requested_size,
|
| const std::vector<SkBitmap>& bitmaps) {}
|
|
|
| - // Message Handler.
|
| - virtual void OnUpdateFaviconURL(
|
| + // Called when the favicon url of the page is updated.
|
| + virtual void UpdateFaviconURL(
|
| int32 page_id,
|
| const std::vector<FaviconURL>& candidates) {}
|
|
|
| protected:
|
| - virtual ~FaviconDownloadHelperDelegate() {}
|
| + virtual ~FaviconDownloadDelegate() {}
|
| };
|
|
|
| -#endif // CHROME_BROWSER_FAVICON_FAVICON_DOWNLOAD_HELPER_DELEGATE_H_
|
| +} // namespace content
|
| +
|
| +#endif // CONTENT_PUBLIC_BROWSER_FAVICON_DOWNLOAD_DELEGATE_H_
|
|
|