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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_FAVICON_IOS_WEB_FAVICON_DRIVER_H_ 5 #ifndef COMPONENTS_FAVICON_IOS_WEB_FAVICON_DRIVER_H_
6 #define COMPONENTS_FAVICON_IOS_WEB_FAVICON_DRIVER_H_ 6 #define COMPONENTS_FAVICON_IOS_WEB_FAVICON_DRIVER_H_
7 7
8 #include "components/favicon/core/favicon_driver_impl.h" 8 #include "components/favicon/core/favicon_driver_impl.h"
9 #include "ios/web/public/web_state/web_state_observer.h" 9 #include "ios/web/public/web_state/web_state_observer.h"
10 #include "ios/web/public/web_state/web_state_user_data.h" 10 #include "ios/web/public/web_state/web_state_user_data.h"
(...skipping 11 matching lines...) Expand all
22 class WebFaviconDriver : public web::WebStateObserver, 22 class WebFaviconDriver : public web::WebStateObserver,
23 public web::WebStateUserData<WebFaviconDriver>, 23 public web::WebStateUserData<WebFaviconDriver>,
24 public FaviconDriverImpl { 24 public FaviconDriverImpl {
25 public: 25 public:
26 static void CreateForWebState(web::WebState* web_state, 26 static void CreateForWebState(web::WebState* web_state,
27 FaviconService* favicon_service, 27 FaviconService* favicon_service,
28 history::HistoryService* history_service, 28 history::HistoryService* history_service,
29 bookmarks::BookmarkModel* bookmark_model); 29 bookmarks::BookmarkModel* bookmark_model);
30 30
31 // FaviconDriver implementation. 31 // FaviconDriver implementation.
32 void FetchFavicon(const GURL& url) override;
32 gfx::Image GetFavicon() const override; 33 gfx::Image GetFavicon() const override;
33 bool FaviconIsValid() const override; 34 bool FaviconIsValid() const override;
34 int StartDownload(const GURL& url, int max_bitmap_size) override; 35 int StartDownload(const GURL& url, int max_bitmap_size) override;
35 bool IsOffTheRecord() override; 36 bool IsOffTheRecord() override;
36 GURL GetActiveURL() override; 37 GURL GetActiveURL() override;
37 bool GetActiveFaviconValidity() override; 38 bool GetActiveFaviconValidity() override;
38 void SetActiveFaviconValidity(bool valid) override; 39 void SetActiveFaviconValidity(bool valid) override;
39 GURL GetActiveFaviconURL() override; 40 GURL GetActiveFaviconURL() override;
40 void SetActiveFaviconURL(const GURL& url) override; 41 void SetActiveFaviconURL(const GURL& url) override;
41 void SetActiveFaviconImage(const gfx::Image& image) override; 42 void SetActiveFaviconImage(const gfx::Image& image) override;
42 43
43 private: 44 private:
44 friend class web::WebStateUserData<WebFaviconDriver>; 45 friend class web::WebStateUserData<WebFaviconDriver>;
45 46
46 WebFaviconDriver(web::WebState* web_state, 47 WebFaviconDriver(web::WebState* web_state,
47 FaviconService* favicon_service, 48 FaviconService* favicon_service,
48 history::HistoryService* history_service, 49 history::HistoryService* history_service,
49 bookmarks::BookmarkModel* bookmark_model); 50 bookmarks::BookmarkModel* bookmark_model);
50 ~WebFaviconDriver() override; 51 ~WebFaviconDriver() override;
51 52
53 // Returns whether the active URL has changed since FetchFavicon() was called.
54 bool ActiveURLChangedSinceFetchFavicon();
55
52 // web::WebStateObserver implementation. 56 // web::WebStateObserver implementation.
53 void FaviconUrlUpdated( 57 void FaviconUrlUpdated(
54 const std::vector<web::FaviconURL>& candidates) override; 58 const std::vector<web::FaviconURL>& candidates) override;
55 59
56 // Returns the active navigation entry's favicon. 60 // Returns the active navigation entry's favicon.
57 web::FaviconStatus& GetFaviconStatus(); 61 web::FaviconStatus& GetFaviconStatus();
58 62
63 // The URL passed to FetchFavicon().
64 GURL fetch_favicon_url_;
65
59 DISALLOW_COPY_AND_ASSIGN(WebFaviconDriver); 66 DISALLOW_COPY_AND_ASSIGN(WebFaviconDriver);
60 }; 67 };
61 68
62 } // namespace favicon 69 } // namespace favicon
63 70
64 #endif // COMPONENTS_FAVICON_IOS_WEB_FAVICON_DRIVER_H_ 71 #endif // COMPONENTS_FAVICON_IOS_WEB_FAVICON_DRIVER_H_
OLDNEW
« 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