chrome/browser/sessions/session_service.cc - Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

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/session_service.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 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/session_restore_browsertest.cc ('k') | chrome/browser/speech/speech_recognition_bubble_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sessions/session_service.cc

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

--- chrome/browser/sessions/session_service.cc (revision 145001)

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

@@ -27,6 +27,7 @@

#include "chrome/browser/sessions/session_restore.h"

#include "chrome/browser/sessions/session_types.h"

#include "chrome/browser/ui/browser_list.h"

+#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/startup/startup_browser_creator.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

@@ -1382,11 +1383,11 @@

bool added_to_windows_to_track = false;

for (int i = 0; i < browser->tab_count(); ++i) {

- TabContents* tab = browser->GetTabContentsAt(i);

+ TabContents* tab = chrome::GetTabContentsAt(browser, i);

DCHECK(tab);

if (tab->profile() == profile() || profile() == NULL) {

BuildCommandsForTab(browser->session_id(), tab, i,

- browser->IsTabPinned(i),

+ browser->tab_strip_model()->IsTabPinned(i),

commands, tab_to_available_range);

if (windows_to_track && !added_to_windows_to_track) {

windows_to_track->insert(browser->session_id().id());