diff options
Diffstat (limited to 'chrome/browser/prerender')
5 files changed, 14 insertions, 24 deletions
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 3b38659..54cfdb1 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -20,7 +20,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/icon_messages.h" #include "chrome/common/prerender_messages.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_child_process_host.h" @@ -32,6 +31,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_view.h" +#include "content/public/common/favicon_url.h" #include "ui/gfx/rect.h" using content::DownloadItem; @@ -295,7 +295,6 @@ void PrerenderContents::StartPrerendering( tab_contents_delegate_.reset(new TabContentsDelegateImpl(this)); new_contents->SetDelegate(tab_contents_delegate_.get()); - // Set the size of the prerender WebContents. prerender_contents_->web_contents()->GetView()->SizeContents(size_); @@ -484,13 +483,13 @@ WebContents* PrerenderContents::CreateWebContents( profile_, NULL, MSG_ROUTING_NONE, NULL, session_storage_namespace_map); } -void PrerenderContents::OnUpdateFaviconURL( +void PrerenderContents::DidUpdateFaviconURL( int32 page_id, - const std::vector<FaviconURL>& urls) { + const std::vector<content::FaviconURL>& urls) { VLOG(1) << "PrerenderContents::OnUpdateFaviconURL" << icon_url_; - for (std::vector<FaviconURL>::const_iterator it = urls.begin(); + for (std::vector<content::FaviconURL>::const_iterator it = urls.begin(); it != urls.end(); ++it) { - if (it->icon_type == FaviconURL::FAVICON) { + if (it->icon_type == content::FaviconURL::FAVICON) { icon_url_ = it->icon_url; VLOG(1) << icon_url_; return; diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index 7461937..8db24c7 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -24,13 +24,13 @@ class Profile; class TabContents; -struct FaviconURL; namespace base { class ProcessMetrics; } namespace content { +struct FaviconURL; class RenderViewHost; class SessionStorageNamespace; class WebContents; @@ -202,6 +202,8 @@ class PrerenderContents : public content::NotificationObserver, const GURL& validated_url, bool is_main_frame, content::RenderViewHost* render_view_host) OVERRIDE; + virtual void DidUpdateFaviconURL(int32 page_id, + const std::vector<content::FaviconURL>& urls) OVERRIDE; virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE; @@ -294,9 +296,6 @@ class PrerenderContents : public content::NotificationObserver, friend class PrerenderRenderViewHostObserver; - // Message handlers. - void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls); - // Returns the RenderViewHost Delegate for this prerender. content::WebContents* GetWebContents(); diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 1cab97e..8dbbf53 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -54,6 +54,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_view.h" +#include "content/public/common/favicon_url.h" using content::BrowserThread; using content::RenderViewHost; @@ -451,10 +452,10 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents, GURL icon_url = prerender_contents->icon_url(); if (!icon_url.is_empty()) { - std::vector<FaviconURL> urls; - urls.push_back(FaviconURL(icon_url, FaviconURL::FAVICON)); + std::vector<content::FaviconURL> urls; + urls.push_back(content::FaviconURL(icon_url, content::FaviconURL::FAVICON)); FaviconTabHelper::FromWebContents(new_tab_contents->web_contents())-> - OnUpdateFaviconURL(prerender_contents->page_id(), urls); + DidUpdateFaviconURL(prerender_contents->page_id(), urls); } // Update PPLT metrics: diff --git a/chrome/browser/prerender/prerender_render_view_host_observer.cc b/chrome/browser/prerender/prerender_render_view_host_observer.cc index fdc6342..7317b61 100644 --- a/chrome/browser/prerender/prerender_render_view_host_observer.cc +++ b/chrome/browser/prerender/prerender_render_view_host_observer.cc @@ -5,7 +5,6 @@ #include "chrome/browser/prerender/prerender_render_view_host_observer.h" #include "chrome/browser/prerender/prerender_contents.h" -#include "chrome/common/icon_messages.h" #include "chrome/common/render_messages.h" using content::RenderViewHost; @@ -34,7 +33,6 @@ bool PrerenderRenderViewHostObserver::OnMessageReceived( bool handled = true; // The following messages we do want to consume. IPC_BEGIN_MESSAGE_MAP(PrerenderRenderViewHostObserver, message) - IPC_MESSAGE_HANDLER(IconHostMsg_UpdateFaviconURL, OnUpdateFaviconURL) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_MaybeCancelPrerenderForHTML5Media, OnMaybeCancelPrerenderForHTML5Media) IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CancelPrerenderForPrinting, @@ -55,12 +53,6 @@ bool PrerenderRenderViewHostObserver::Send(IPC::Message* message) { return content::RenderViewHostObserver::Send(message); } -void PrerenderRenderViewHostObserver::OnUpdateFaviconURL( - int32 page_id, - const std::vector<FaviconURL>& urls) { - prerender_contents_->OnUpdateFaviconURL(page_id, urls); -} - void PrerenderRenderViewHostObserver::OnMaybeCancelPrerenderForHTML5Media() { prerender_contents_->Destroy(FINAL_STATUS_HTML5_MEDIA); } diff --git a/chrome/browser/prerender/prerender_render_view_host_observer.h b/chrome/browser/prerender/prerender_render_view_host_observer.h index e6ecf8e..c804b86 100644 --- a/chrome/browser/prerender/prerender_render_view_host_observer.h +++ b/chrome/browser/prerender/prerender_render_view_host_observer.h @@ -9,9 +9,8 @@ #include "content/public/browser/render_view_host_observer.h" -struct FaviconURL; - namespace content { +struct FaviconURL; class RenderViewHost; } @@ -40,7 +39,7 @@ class PrerenderRenderViewHostObserver : public content::RenderViewHostObserver { private: // Message handlers. - void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls); + void OnMaybeCancelPrerenderForHTML5Media(); void OnCancelPrerenderForPrinting(); |