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

Side by Side Diff: chrome/browser/favicon/favicon_tab_helper.h

Issue 261403003: Removes usage of NavigationEntry from favicon_handler.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_
6 #define CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_ 6 #define CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 const std::vector<content::FaviconURL>& candidates) OVERRIDE; 65 const std::vector<content::FaviconURL>& candidates) OVERRIDE;
66 66
67 // Saves the favicon for the current page. 67 // Saves the favicon for the current page.
68 void SaveFavicon(); 68 void SaveFavicon();
69 69
70 // FaviconDriver methods. 70 // FaviconDriver methods.
71 virtual content::NavigationEntry* GetActiveEntry() OVERRIDE; 71 virtual content::NavigationEntry* GetActiveEntry() OVERRIDE;
72 virtual int StartDownload(const GURL& url, int max_bitmap_size) OVERRIDE; 72 virtual int StartDownload(const GURL& url, int max_bitmap_size) OVERRIDE;
73 virtual void NotifyFaviconUpdated(bool icon_url_changed) OVERRIDE; 73 virtual void NotifyFaviconUpdated(bool icon_url_changed) OVERRIDE;
74 virtual bool IsOffTheRecord() OVERRIDE; 74 virtual bool IsOffTheRecord() OVERRIDE;
75 virtual const GURL GetActiveURL() OVERRIDE;
76 virtual const GURL GetActiveFaviconURL() OVERRIDE;
77 virtual bool GetActiveFaviconValidity() OVERRIDE;
78 virtual void SetActiveFaviconValidity(bool validity) OVERRIDE;
79 virtual void SetActiveFaviconImage(gfx::Image image) OVERRIDE;
80 virtual void SetActiveFaviconURL(GURL url) OVERRIDE;
75 81
76 // Favicon download callback. 82 // Favicon download callback.
77 void DidDownloadFavicon( 83 void DidDownloadFavicon(
78 int id, 84 int id,
79 int http_status_code, 85 int http_status_code,
80 const GURL& image_url, 86 const GURL& image_url,
81 const std::vector<SkBitmap>& bitmaps, 87 const std::vector<SkBitmap>& bitmaps,
82 const std::vector<gfx::Size>& original_bitmap_sizes); 88 const std::vector<gfx::Size>& original_bitmap_sizes);
83 89
84 // FaviconClient implementation: 90 // FaviconClient implementation:
(...skipping 19 matching lines...) Expand all
104 scoped_ptr<FaviconHandler> favicon_handler_; 110 scoped_ptr<FaviconHandler> favicon_handler_;
105 111
106 // Handles downloading touchicons. It is NULL if 112 // Handles downloading touchicons. It is NULL if
107 // browser_defaults::kEnableTouchIcon is false. 113 // browser_defaults::kEnableTouchIcon is false.
108 scoped_ptr<FaviconHandler> touch_icon_handler_; 114 scoped_ptr<FaviconHandler> touch_icon_handler_;
109 115
110 DISALLOW_COPY_AND_ASSIGN(FaviconTabHelper); 116 DISALLOW_COPY_AND_ASSIGN(FaviconTabHelper);
111 }; 117 };
112 118
113 #endif // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_ 119 #endif // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698