Commit 33986d3e authored by sky@chromium.org's avatar sky@chromium.org

Changes instant to not reserve page ids. Turns out this isn't

necessary.

BUG=none
TEST=none
R=brettw@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86624 0039d316-1c4b-4281-b951-d872f2087c98
parent bb647d8d
...@@ -1001,13 +1001,6 @@ void InstantLoader::CreatePreviewContents(TabContentsWrapper* tab_contents) { ...@@ -1001,13 +1001,6 @@ void InstantLoader::CreatePreviewContents(TabContentsWrapper* tab_contents) {
tab_contents->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL); tab_contents->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
preview_contents_.reset(new TabContentsWrapper(new_contents)); preview_contents_.reset(new TabContentsWrapper(new_contents));
preview_contents_->blocked_content_tab_helper()->SetAllContentsBlocked(true); preview_contents_->blocked_content_tab_helper()->SetAllContentsBlocked(true);
// Propagate the max page id. That way if we end up merging the two
// NavigationControllers (which happens if we commit) none of the page ids
// will overlap.
int32 max_page_id = tab_contents->tab_contents()->GetMaxPageID();
if (max_page_id != -1)
preview_contents_->controller().set_max_restored_page_id(max_page_id + 1);
preview_tab_contents_delegate_.reset(new TabContentsDelegateImpl(this)); preview_tab_contents_delegate_.reset(new TabContentsDelegateImpl(this));
new_contents->set_delegate(preview_tab_contents_delegate_.get()); new_contents->set_delegate(preview_tab_contents_delegate_.get());
preview_contents_->download_tab_helper()->set_delegate( preview_contents_->download_tab_helper()->set_delegate(
......
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