Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: content/browser/tab_contents/tab_contents.cc

Issue 7633071: Remove references to prerender and instant in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove whitespace Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/common/view_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/tab_contents/tab_contents.h" 5 #include "content/browser/tab_contents/tab_contents.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 592
593 if (delegate_) 593 if (delegate_)
594 delegate_->DidNavigateToPendingEntry(this); 594 delegate_->DidNavigateToPendingEntry(this);
595 595
596 return true; 596 return true;
597 } 597 }
598 598
599 void TabContents::SetHistoryLengthAndPrune(const SiteInstance* site_instance, 599 void TabContents::SetHistoryLengthAndPrune(const SiteInstance* site_instance,
600 int history_length, 600 int history_length,
601 int32 minimum_page_id) { 601 int32 minimum_page_id) {
602 // SetHistoryLengthAndPrune doesn't handle pending cross-site navigations 602 // SetHistoryLengthAndPrune doesn't work when there are pending cross-site
603 // cleanly. Since it's only used when swapping in instant and prerendered 603 // navigations. Callers should ensure that this is the case.
604 // TabContents, checks are done at a higher level to ensure that the pages
605 // are not swapped in during this case.
606 if (render_manager_.pending_render_view_host()) { 604 if (render_manager_.pending_render_view_host()) {
607 NOTREACHED(); 605 NOTREACHED();
608 return; 606 return;
609 } 607 }
610 RenderViewHost* rvh = render_view_host(); 608 RenderViewHost* rvh = render_view_host();
611 if (!rvh) { 609 if (!rvh) {
612 NOTREACHED(); 610 NOTREACHED();
613 return; 611 return;
614 } 612 }
615 if (site_instance && rvh->site_instance() != site_instance) { 613 if (site_instance && rvh->site_instance() != site_instance) {
(...skipping 1321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1937 } 1935 }
1938 1936
1939 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { 1937 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) {
1940 render_manager_.SwapInRenderViewHost(rvh); 1938 render_manager_.SwapInRenderViewHost(rvh);
1941 } 1939 }
1942 1940
1943 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { 1941 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
1944 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh); 1942 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
1945 rwh_view->SetSize(view()->GetContainerSize()); 1943 rwh_view->SetSize(view()->GetContainerSize());
1946 } 1944 }
OLDNEW
« no previous file with comments | « no previous file | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698