Commit 02b9b2b6 authored by jam@chromium.org's avatar jam@chromium.org

Fix compile error.

Review URL: http://codereview.chromium.org/6992028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86440 0039d316-1c4b-4281-b951-d872f2087c98
parent 105bb0f7
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "chrome/browser/background_contents_service.h" #include "chrome/browser/background_contents_service.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/history/history_marshaling.h" #include "chrome/browser/history/history_marshaling.h"
#include "chrome/browser/history/history_tab_helper.h"
#include "chrome/browser/prerender/prerender_final_status.h" #include "chrome/browser/prerender/prerender_final_status.h"
#include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/prerender/prerender_render_widget_host_view.h" #include "chrome/browser/prerender/prerender_render_widget_host_view.h"
...@@ -107,10 +108,10 @@ class PrerenderContents::TabContentsDelegateImpl ...@@ -107,10 +108,10 @@ class PrerenderContents::TabContentsDelegateImpl
return false; return false;
} }
// Commits the History of Pages to the given TabContents. // Commits the History of Pages to the given TabContents.
void CommitHistory(TabContents* tc) { void CommitHistory(TabContentsWrapper* tab) {
DCHECK(tc != NULL);
for (size_t i = 0; i < add_page_vector_.size(); ++i) for (size_t i = 0; i < add_page_vector_.size(); ++i)
tc->UpdateHistoryForNavigation(add_page_vector_[i].get()); tab->history_tab_helper()->UpdateHistoryForNavigation(
add_page_vector_[i].get());
} }
private: private:
...@@ -832,9 +833,9 @@ const RenderViewHost* PrerenderContents::render_view_host() const { ...@@ -832,9 +833,9 @@ const RenderViewHost* PrerenderContents::render_view_host() const {
return render_view_host_; return render_view_host_;
} }
void PrerenderContents::CommitHistory(TabContents* tc) { void PrerenderContents::CommitHistory(TabContentsWrapper* tab) {
if (tab_contents_delegate_.get()) if (tab_contents_delegate_.get())
tab_contents_delegate_->CommitHistory(tc); tab_contents_delegate_->CommitHistory(tab);
} }
} // namespace prerender } // namespace prerender
...@@ -252,7 +252,7 @@ class PrerenderContents : public RenderViewHostDelegate, ...@@ -252,7 +252,7 @@ class PrerenderContents : public RenderViewHostDelegate,
// Applies all the URL history encountered during prerendering to the // Applies all the URL history encountered during prerendering to the
// new tab. // new tab.
void CommitHistory(TabContents* tc); void CommitHistory(TabContentsWrapper* tab);
int32 starting_page_id() { return starting_page_id_; } int32 starting_page_id() { return starting_page_id_; }
......
...@@ -598,7 +598,7 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents, ...@@ -598,7 +598,7 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents,
false); false);
old_tab_contents->delegate()->SwapTabContents(old_tab_contents, old_tab_contents->delegate()->SwapTabContents(old_tab_contents,
new_tab_contents); new_tab_contents);
prerender_contents->CommitHistory(new_tab_contents->tab_contents()); prerender_contents->CommitHistory(new_tab_contents);
GURL icon_url = prerender_contents->icon_url(); GURL icon_url = prerender_contents->icon_url();
if (!icon_url.is_empty()) { if (!icon_url.is_empty()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment