chrome/browser/ui/views/frame/browser_view.cc - Issue 6901031: Profile shouldn't own Session/TabRestore services.

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/ui/views/frame/browser_view.cc

Issue 6901031: Profile shouldn't own Session/TabRestore services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix mac build Created 9 years, 8 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:

Index: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index 8ab3ff2b38d6a728fffbe10138ea4abd8c956db7..6357285e50ebada8941d16035b1674468b847189 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -32,6 +32,7 @@

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

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

+#include "chrome/browser/sessions/tab_restore_service_factory.h"

#include "chrome/browser/sidebar/sidebar_container.h"

#include "chrome/browser/sidebar/sidebar_manager.h"

#include "chrome/browser/tabs/tab_strip_model.h"

@@ -1368,7 +1369,8 @@ string16 BrowserView::GetLabelForCommandId(int command_id) const {

int string_id = IDS_RESTORE_TAB;

if (IsCommandIdEnabled(command_id)) {

- TabRestoreService* trs = browser_->profile()->GetTabRestoreService();

+ TabRestoreService* trs =

+ TabRestoreServiceFactory::GetForProfile(browser_->profile());

if (trs && trs->entries().front()->type == TabRestoreService::WINDOW)

string_id = IDS_RESTORE_WINDOW;

}