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

Side by Side Diff: components/favicon/content/content_favicon_driver.h

Issue 1399913002: Stop FaviconHandler from querying GetActiveFaviconValidity() part 2/2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@favicon_remove_validity_check
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | components/favicon/content/content_favicon_driver.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_CONTENT_CONTENT_FAVICON_DRIVER_H_ 5 #ifndef COMPONENTS_FAVICON_CONTENT_CONTENT_FAVICON_DRIVER_H_
6 #define COMPONENTS_FAVICON_CONTENT_CONTENT_FAVICON_DRIVER_H_ 6 #define COMPONENTS_FAVICON_CONTENT_CONTENT_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 "content/public/browser/web_contents_observer.h" 9 #include "content/public/browser/web_contents_observer.h"
10 #include "content/public/browser/web_contents_user_data.h" 10 #include "content/public/browser/web_contents_user_data.h"
(...skipping 29 matching lines...) Expand all
40 // Saves the favicon for the last committed navigation entry to the thumbnail 40 // Saves the favicon for the last committed navigation entry to the thumbnail
41 // database. 41 // database.
42 void SaveFavicon(); 42 void SaveFavicon();
43 43
44 // FaviconDriver implementation. 44 // FaviconDriver implementation.
45 gfx::Image GetFavicon() const override; 45 gfx::Image GetFavicon() const override;
46 bool FaviconIsValid() const override; 46 bool FaviconIsValid() const override;
47 int StartDownload(const GURL& url, int max_bitmap_size) override; 47 int StartDownload(const GURL& url, int max_bitmap_size) override;
48 bool IsOffTheRecord() override; 48 bool IsOffTheRecord() override;
49 GURL GetActiveURL() override; 49 GURL GetActiveURL() override;
50 bool GetActiveFaviconValidity() override;
51 void SetActiveFaviconValidity(bool valid) override; 50 void SetActiveFaviconValidity(bool valid) override;
sky 2015/10/12 16:05:32 Can you get rid of the setter too? Otherwise this
pkotwicz 2015/10/13 14:46:37 I can't remove the setter yet because it is called
52 GURL GetActiveFaviconURL() override; 51 GURL GetActiveFaviconURL() override;
53 void SetActiveFaviconURL(const GURL& url) override; 52 void SetActiveFaviconURL(const GURL& url) override;
54 void SetActiveFaviconImage(const gfx::Image& image) override; 53 void SetActiveFaviconImage(const gfx::Image& image) override;
55 54
56 protected: 55 protected:
57 ContentFaviconDriver(content::WebContents* web_contents, 56 ContentFaviconDriver(content::WebContents* web_contents,
58 FaviconService* favicon_service, 57 FaviconService* favicon_service,
59 history::HistoryService* history_service, 58 history::HistoryService* history_service,
60 bookmarks::BookmarkModel* bookmark_model); 59 bookmarks::BookmarkModel* bookmark_model);
61 ~ContentFaviconDriver() override; 60 ~ContentFaviconDriver() override;
(...skipping 19 matching lines...) Expand all
81 80
82 GURL bypass_cache_page_url_; 81 GURL bypass_cache_page_url_;
83 std::vector<content::FaviconURL> favicon_urls_; 82 std::vector<content::FaviconURL> favicon_urls_;
84 83
85 DISALLOW_COPY_AND_ASSIGN(ContentFaviconDriver); 84 DISALLOW_COPY_AND_ASSIGN(ContentFaviconDriver);
86 }; 85 };
87 86
88 } // namespace favicon 87 } // namespace favicon
89 88
90 #endif // COMPONENTS_FAVICON_CONTENT_CONTENT_FAVICON_DRIVER_H_ 89 #endif // COMPONENTS_FAVICON_CONTENT_CONTENT_FAVICON_DRIVER_H_
OLDNEW
« no previous file with comments | « no previous file | components/favicon/content/content_favicon_driver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698