Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Unified Diff: components/favicon/ios/web_favicon_driver.h

Issue 1272413002: Remove useless FaviconHandler::PageChangedSinceFaviconWasRequested() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/favicon/core/favicon_handler_unittest.cc ('k') | components/favicon/ios/web_favicon_driver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/favicon/ios/web_favicon_driver.h
diff --git a/components/favicon/ios/web_favicon_driver.h b/components/favicon/ios/web_favicon_driver.h
index 9ea3e7d2a1d2b052191c8d12d0b8aef7a102cb98..0be7bcef3a2e24ac91fa6c2abb6ec9648c02fed3 100644
--- a/components/favicon/ios/web_favicon_driver.h
+++ b/components/favicon/ios/web_favicon_driver.h
@@ -29,6 +29,7 @@ class WebFaviconDriver : public web::WebStateObserver,
bookmarks::BookmarkModel* bookmark_model);
// FaviconDriver implementation.
+ void FetchFavicon(const GURL& url) override;
gfx::Image GetFavicon() const override;
bool FaviconIsValid() const override;
int StartDownload(const GURL& url, int max_bitmap_size) override;
@@ -49,6 +50,9 @@ class WebFaviconDriver : public web::WebStateObserver,
bookmarks::BookmarkModel* bookmark_model);
~WebFaviconDriver() override;
+ // Returns whether the active URL has changed since FetchFavicon() was called.
+ bool ActiveURLChangedSinceFetchFavicon();
+
// web::WebStateObserver implementation.
void FaviconUrlUpdated(
const std::vector<web::FaviconURL>& candidates) override;
@@ -56,6 +60,9 @@ class WebFaviconDriver : public web::WebStateObserver,
// Returns the active navigation entry's favicon.
web::FaviconStatus& GetFaviconStatus();
+ // The URL passed to FetchFavicon().
+ GURL fetch_favicon_url_;
+
DISALLOW_COPY_AND_ASSIGN(WebFaviconDriver);
};
« no previous file with comments | « components/favicon/core/favicon_handler_unittest.cc ('k') | components/favicon/ios/web_favicon_driver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698