chrome/browser/ui/cocoa/history_menu_bridge.mm - 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/cocoa/history_menu_bridge.mm

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

Patch Set: Rebase again and hope upload works this time 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/cocoa/history_menu_bridge.mm

diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm

index ef5be5fdd207fcbf58da7281e8804020fd5eeb10..f8267613846abb78247e86b04839004d6d96ba35 100644

--- a/chrome/browser/ui/cocoa/history_menu_bridge.mm

+++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm

@@ -15,6 +15,7 @@

#include "chrome/browser/history/page_usage_data.h"

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

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

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

#import "chrome/browser/ui/cocoa/history_menu_cocoa_controller.h"

#include "chrome/common/url_constants.h"

#include "content/common/notification_registrar.h"

@@ -84,7 +85,7 @@ HistoryMenuBridge::HistoryMenuBridge(Profile* profile)

Init();

}

- tab_restore_service_ = profile_->GetTabRestoreService();

+ tab_restore_service_ = TabRestoreServiceFactory::GetForProfile(profile_);

if (tab_restore_service_) {

tab_restore_service_->AddObserver(this);

tab_restore_service_->LoadTabsFromLastSession();