chrome/browser/sessions/tab_restore_service.cc - Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

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

Unified Diff: chrome/browser/sessions/tab_restore_service.cc

Issue 8983010: Convert WebContents to return a content::NavigationController instead of the implementation. Upda... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 8 years, 12 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sessions/tab_restore_service.h ('k') | chrome/browser/sessions/tab_restore_service_browsertest.cc » ('j') | content/browser/tab_contents/navigation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/tab_restore_service.cc

===================================================================

--- chrome/browser/sessions/tab_restore_service.cc (revision 116232)

+++ chrome/browser/sessions/tab_restore_service.cc (working copy)

@@ -27,8 +27,8 @@

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_constants.h"

#include "chrome/common/url_constants.h"

-#include "content/browser/tab_contents/navigation_controller.h"

#include "content/browser/tab_contents/tab_contents.h"

+#include "content/public/browser/navigation_controller.h"

#include "content/public/browser/navigation_entry.h"

using base::Time;

@@ -218,7 +218,7 @@

observer_list_.RemoveObserver(observer);

}

-void TabRestoreService::CreateHistoricalTab(NavigationController* tab,

+void TabRestoreService::CreateHistoricalTab(content::NavigationController* tab,

int index) {

if (restoring_)

return;

@@ -486,7 +486,7 @@

void TabRestoreService::PopulateTab(Tab* tab,

int index,

TabRestoreServiceDelegate* delegate,

- NavigationController* controller) {

+ content::NavigationController* controller) {

const int pending_index = controller->GetPendingEntryIndex();

int entry_count = controller->GetEntryCount();

if (entry_count == 0 && pending_index == 0)