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

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

Issue 266053003: Remove page IDs from three WebContentsObserver APIs that don't need it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with Avi's change 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 | Annotate | Revision Log
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // Returns the current tab's favicon urls. If this is empty, 56 // Returns the current tab's favicon urls. If this is empty,
57 // DidUpdateFaviconURL has not yet been called for the current navigation. 57 // DidUpdateFaviconURL has not yet been called for the current navigation.
58 const std::vector<content::FaviconURL>& favicon_urls() const { 58 const std::vector<content::FaviconURL>& favicon_urls() const {
59 return favicon_urls_; 59 return favicon_urls_;
60 } 60 }
61 61
62 // content::WebContentsObserver override. Must be public, because also 62 // content::WebContentsObserver override. Must be public, because also
63 // called from PrerenderContents. 63 // called from PrerenderContents.
64 virtual void DidUpdateFaviconURL( 64 virtual void DidUpdateFaviconURL(
65 int32 page_id,
66 const std::vector<content::FaviconURL>& candidates) OVERRIDE; 65 const std::vector<content::FaviconURL>& candidates) OVERRIDE;
67 66
68 // Saves the favicon for the current page. 67 // Saves the favicon for the current page.
69 void SaveFavicon(); 68 void SaveFavicon();
70 69
71 // FaviconDriver methods. 70 // FaviconDriver methods.
72 virtual content::NavigationEntry* GetActiveEntry() OVERRIDE; 71 virtual content::NavigationEntry* GetActiveEntry() OVERRIDE;
73 virtual int StartDownload(const GURL& url, int max_bitmap_size) OVERRIDE; 72 virtual int StartDownload(const GURL& url, int max_bitmap_size) OVERRIDE;
74 virtual void NotifyFaviconUpdated(bool icon_url_changed) OVERRIDE; 73 virtual void NotifyFaviconUpdated(bool icon_url_changed) OVERRIDE;
75 virtual bool IsOffTheRecord() OVERRIDE; 74 virtual bool IsOffTheRecord() OVERRIDE;
(...skipping 29 matching lines...) Expand all
105 scoped_ptr<FaviconHandler> favicon_handler_; 104 scoped_ptr<FaviconHandler> favicon_handler_;
106 105
107 // Handles downloading touchicons. It is NULL if 106 // Handles downloading touchicons. It is NULL if
108 // browser_defaults::kEnableTouchIcon is false. 107 // browser_defaults::kEnableTouchIcon is false.
109 scoped_ptr<FaviconHandler> touch_icon_handler_; 108 scoped_ptr<FaviconHandler> touch_icon_handler_;
110 109
111 DISALLOW_COPY_AND_ASSIGN(FaviconTabHelper); 110 DISALLOW_COPY_AND_ASSIGN(FaviconTabHelper);
112 }; 111 };
113 112
114 #endif // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_ 113 #endif // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/favicon/favicon_handler_unittest.cc ('k') | chrome/browser/favicon/favicon_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698