Index: chrome/browser/favicon/favicon_tab_helper.h |
diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h |
index a5ef1ae2fd1f198a738976d08623f37a9145372a..836f8c5f66854bbda30b93275fdad8ea019daf53 100644 |
--- a/chrome/browser/favicon/favicon_tab_helper.h |
+++ b/chrome/browser/favicon/favicon_tab_helper.h |
@@ -51,6 +51,16 @@ class FaviconTabHelper : public content::WebContentsObserver, |
// space is provided for the favicon, and the favicon is never displayed. |
virtual bool ShouldDisplayFavicon(); |
+ // Returns the current tab's favicon urls. Returns NULL if the current tab's |
+ // favicon urls have not been populated yet. |
+ // |
+ // Note that this is not guaranteed to be populated until the tab is fully |
+ // loaded. Callers that want to handle favicon urls before the page has loaded |
+ // should implement WebContentsObserver::DidUpdateFaviconURL. |
pkotwicz
2013/12/02 01:00:57
"Callers that want to handle favicon urls before t
calamity
2013/12/03 05:52:15
Done.
|
+ const std::vector<content::FaviconURL>* GetFaviconURLs() { |
+ return favicon_urls_.get(); |
+ } |
+ |
// Allows the client to determine if they want to fetch the Favicons as |
// they are discovered. |
void set_should_fetch_icons(bool fetch) { |
@@ -94,6 +104,8 @@ class FaviconTabHelper : public content::WebContentsObserver, |
Profile* profile_; |
bool should_fetch_icons_; |
+ scoped_ptr<std::vector<content::FaviconURL> > favicon_urls_; |
pkotwicz
2013/12/02 01:00:57
Can this just be a std::vector<content::FaviconURL
calamity
2013/12/03 05:52:15
This would require a separate bool to track whethe
pkotwicz
2013/12/03 19:06:49
Given the current implementation, we should make t
|
+ |
scoped_ptr<FaviconHandler> favicon_handler_; |
// Handles downloading touchicons. It is NULL if |