diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 17:27:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 17:27:50 +0000 |
| commit | 02b9b2b6f752ff4d59ee3e3278c186b013237f8c (patch) | |
| tree | 652eaa923f6b746498c7812d729e8912dac9b3f4 | |
| parent | 105bb0f7365ffbfa1530037f7d22595862d82bc4 (diff) | |
| download | chromium_src-02b9b2b6f752ff4d59ee3e3278c186b013237f8c.zip chromium_src-02b9b2b6f752ff4d59ee3e3278c186b013237f8c.tar.gz chromium_src-02b9b2b6f752ff4d59ee3e3278c186b013237f8c.tar.bz2 | |
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
| -rw-r--r-- | chrome/browser/prerender/prerender_contents.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_contents.h | 2 | ||||
| -rw-r--r-- | chrome/browser/prerender/prerender_manager.cc | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index be2cfe2..b514478 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -13,6 +13,7 @@ #include "chrome/browser/background_contents_service.h" #include "chrome/browser/browser_process.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_manager.h" #include "chrome/browser/prerender/prerender_render_widget_host_view.h" @@ -107,10 +108,10 @@ class PrerenderContents::TabContentsDelegateImpl return false; } // Commits the History of Pages to the given TabContents. - void CommitHistory(TabContents* tc) { - DCHECK(tc != NULL); + void CommitHistory(TabContentsWrapper* tab) { 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: @@ -832,9 +833,9 @@ const RenderViewHost* PrerenderContents::render_view_host() const { return render_view_host_; } -void PrerenderContents::CommitHistory(TabContents* tc) { +void PrerenderContents::CommitHistory(TabContentsWrapper* tab) { if (tab_contents_delegate_.get()) - tab_contents_delegate_->CommitHistory(tc); + tab_contents_delegate_->CommitHistory(tab); } } // namespace prerender diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h index 153073d..eeb6101 100644 --- a/chrome/browser/prerender/prerender_contents.h +++ b/chrome/browser/prerender/prerender_contents.h @@ -252,7 +252,7 @@ class PrerenderContents : public RenderViewHostDelegate, // Applies all the URL history encountered during prerendering to the // new tab. - void CommitHistory(TabContents* tc); + void CommitHistory(TabContentsWrapper* tab); int32 starting_page_id() { return starting_page_id_; } diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc index 59aafa9..a95f1f1 100644 --- a/chrome/browser/prerender/prerender_manager.cc +++ b/chrome/browser/prerender/prerender_manager.cc @@ -598,7 +598,7 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tab_contents, false); old_tab_contents->delegate()->SwapTabContents(old_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(); if (!icon_url.is_empty()) { |