Issue 7649009: Merge of 97624 to 835 branch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Issue 7649009: Merge of 97624 to 835 branch. (Closed)

Created:
9 years, 4 months ago by cbentzel

Modified:
9 years, 4 months ago

Reviewers:

CC:
chromium-reviews, Avi (use Gerrit), tburkard+watch_chromium.org, Paweł Hajdan Jr., jam, cbentzel+watch_chromium.org, joi+watch-content_chromium.org, dominich+watch_chromium.org, brettw-cc_chromium.org, mmenke

Base URL:
svn://svn.chromium.org/chrome/branches/835/src/

Visibility:
Public.

Description

Merge of 97624 to 835 branch. This is mostly just a patch of 97624, with the following manual changes. - Copied TabContents::GetPendingSiteInstance over from trunk. - Moved changes out of chrome/test/base and into the files that existed at the branch point. TBR=cbentzel,creis BUG=89798 TEST=NavigationControllerTest.CopyStateFromAndPrune* RenderViewTest.SetHistoryLengthAndPrune Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=96740

Patch Set 1 #

Created: 9 years, 4 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+377 lines, -57 lines)			Patch
M	chrome/browser/prerender/prerender_contents.h	View	1 chunk	+5 lines, -0 lines	0 comments	Download
M	chrome/browser/prerender/prerender_contents.cc	View	2 chunks	+21 lines, -2 lines	0 comments	Download
M	chrome/browser/prerender/prerender_final_status.h	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	chrome/browser/prerender/prerender_final_status.cc	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	chrome/browser/prerender/prerender_manager.cc	View	1 chunk	+8 lines, -0 lines	0 comments	Download
M	chrome/browser/tab_contents/web_contents_unittest.cc	View	2 chunks	+6 lines, -1 line	0 comments	Download
M	chrome/test/render_view_test.h	View	1 chunk	+3 lines, -0 lines	0 comments	Download
M	chrome/test/render_view_test.cc	View	1 chunk	+7 lines, -0 lines	0 comments	Download
M	content/browser/tab_contents/navigation_controller.cc	View	3 chunks	+21 lines, -2 lines	0 comments	Download
M	content/browser/tab_contents/navigation_controller_unittest.cc	View	6 chunks	+14 lines, -0 lines	0 comments	Download
M	content/browser/tab_contents/tab_contents.h	View	2 chunks	+8 lines, -3 lines	0 comments	Download
M	content/browser/tab_contents/tab_contents.cc	View	2 chunks	+28 lines, -4 lines	0 comments	Download
M	content/browser/tab_contents/test_tab_contents.h	View	3 chunks	+27 lines, -4 lines	0 comments	Download
M	content/browser/tab_contents/test_tab_contents.cc	View	2 chunks	+28 lines, -1 line	0 comments	Download
M	content/common/view_messages.h	View	1 chunk	+13 lines, -11 lines	0 comments	Download
M	content/renderer/render_view.h	View	3 chunks	+2 lines, -1 line	0 comments	Download
M	content/renderer/render_view.cc	View	3 chunks	+24 lines, -28 lines	0 comments	Download
M	content/renderer/render_view_browsertest.cc	View	1 chunk	+160 lines, -0 lines	0 comments	Download