OLD | NEW |
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" |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "components/favicon/content/content_favicon_driver.h" |
12 #include "components/favicon/core/favicon_handler_delegate.h" | 13 #include "components/favicon/core/favicon_handler_delegate.h" |
13 #include "content/public/browser/web_contents_observer.h" | 14 #include "content/public/browser/web_contents_observer.h" |
14 #include "content/public/browser/web_contents_user_data.h" | 15 #include "content/public/browser/web_contents_user_data.h" |
15 #include "content/public/common/favicon_url.h" | 16 #include "content/public/common/favicon_url.h" |
16 | 17 |
17 namespace gfx { | 18 namespace gfx { |
18 class Image; | 19 class Image; |
19 } | 20 } |
20 | 21 |
21 class GURL; | 22 class GURL; |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 friend class content::WebContentsUserData<FaviconTabHelper>; | 85 friend class content::WebContentsUserData<FaviconTabHelper>; |
85 | 86 |
86 // content::WebContentsObserver overrides. | 87 // content::WebContentsObserver overrides. |
87 virtual void DidStartNavigationToPendingEntry( | 88 virtual void DidStartNavigationToPendingEntry( |
88 const GURL& url, | 89 const GURL& url, |
89 content::NavigationController::ReloadType reload_type) OVERRIDE; | 90 content::NavigationController::ReloadType reload_type) OVERRIDE; |
90 virtual void DidNavigateMainFrame( | 91 virtual void DidNavigateMainFrame( |
91 const content::LoadCommittedDetails& details, | 92 const content::LoadCommittedDetails& details, |
92 const content::FrameNavigateParams& params) OVERRIDE; | 93 const content::FrameNavigateParams& params) OVERRIDE; |
93 | 94 |
| 95 ContentFaviconDriver driver_; |
| 96 |
94 Profile* profile_; | 97 Profile* profile_; |
95 | 98 |
96 std::vector<content::FaviconURL> favicon_urls_; | 99 std::vector<content::FaviconURL> favicon_urls_; |
97 | 100 |
98 scoped_ptr<FaviconHandler> favicon_handler_; | 101 scoped_ptr<FaviconHandler> favicon_handler_; |
99 | 102 |
100 // Handles downloading touchicons. It is NULL if | 103 // Handles downloading touchicons. It is NULL if |
101 // browser_defaults::kEnableTouchIcon is false. | 104 // browser_defaults::kEnableTouchIcon is false. |
102 scoped_ptr<FaviconHandler> touch_icon_handler_; | 105 scoped_ptr<FaviconHandler> touch_icon_handler_; |
103 | 106 |
104 DISALLOW_COPY_AND_ASSIGN(FaviconTabHelper); | 107 DISALLOW_COPY_AND_ASSIGN(FaviconTabHelper); |
105 }; | 108 }; |
106 | 109 |
107 #endif // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_ | 110 #endif // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_ |
OLD | NEW |