diff options
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.h | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 2d62549..fd97827 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -221,7 +221,6 @@ TabContents::TabContents(Profile* profile, registrar_(), ALLOW_THIS_IN_INITIALIZER_LIST(printing_(*this)), save_package_(), - cancelable_consumer_(), form_field_history_manager_(), autofill_manager_(), password_manager_(), diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 18f0d44..2a84b8c 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -175,6 +175,11 @@ class TabContents : public PageNavigator, return view_.get(); } + // Returns the FavIconHelper of this TabContents. + FavIconHelper& fav_icon_helper() { + return fav_icon_helper_; + } + #ifdef UNIT_TEST // Expose the render manager for testing. RenderViewHostManager* render_manager() { return &render_manager_; } @@ -994,11 +999,6 @@ class TabContents : public PageNavigator, // SavePackage, lazily created. scoped_refptr<SavePackage> save_package_; - // Tracks our pending CancelableRequests. This maps pending requests to - // page IDs so that we know whether a given callback still applies. The - // page ID -1 means no page ID was set. - CancelableRequestConsumerT<int32, -1> cancelable_consumer_; - // FormFieldHistoryManager, lazily created. scoped_ptr<FormFieldHistoryManager> form_field_history_manager_; |