diff options
Diffstat (limited to 'content/browser/tab_contents/tab_contents.cc')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 6e5fe75..26aa66a 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -371,9 +371,7 @@ TabContents::~TabContents() { } void TabContents::AddObservers() { - favicon_helper_.reset(new FaviconHelper(this, FaviconHelper::FAVICON)); - if (browser_defaults::kEnableTouchIcon) - touch_icon_helper_.reset(new FaviconHelper(this, FaviconHelper::TOUCH)); + favicon_helper_.reset(new FaviconHelper(this)); plugin_observer_.reset(new PluginObserver(this)); safebrowsing_detection_host_.reset(new safe_browsing::ClientSideDetectionHost( this)); @@ -412,7 +410,6 @@ bool TabContents::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(ViewHostMsg_GoToEntryAtOffset, OnGoToEntryAtOffset) IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents) IPC_MESSAGE_HANDLER(ViewHostMsg_PageTranslated, OnPageTranslated) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFaviconURL, OnUpdateFaviconURL) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() @@ -1537,9 +1534,6 @@ void TabContents::DidNavigateMainFramePostCommit( // Get the favicon, either from history or request it from the net. favicon_helper_->FetchFavicon(details.entry->url()); - if (touch_icon_helper_.get()) - touch_icon_helper_->FetchFavicon(details.entry->url()); - // Clear all page actions, blocked content notifications and browser actions // for this tab, unless this is an in-page navigation. if (!details.is_in_page) { @@ -2411,14 +2405,6 @@ void TabContents::RequestDesktopNotificationPermission( render_view_host()->routing_id(), callback_context, this); } -void TabContents::OnUpdateFaviconURL( - int32 page_id, - const std::vector<FaviconURL>& candidates) { - favicon_helper().OnUpdateFaviconURL(page_id, candidates); - if (touch_icon_helper_.get()) - touch_icon_helper_->OnUpdateFaviconURL(page_id, candidates); -} - void TabContents::BeforeUnloadFiredFromRenderManager( bool proceed, bool* proceed_to_fire_unload) { |