chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm - Issue 6660028: Decouple TabRestoreService from Browser

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_cocoa_controller.mm

Issue 6660028: Decouple TabRestoreService from Browser (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fix mac build and handle NULL in delegate statics Created 9 years, 9 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_cocoa_controller.mm

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

index f3662a4e3c069cd412f12c1dab217e5640c4fc8d..cb11899c101de50f4df6b4d1beb93e2826ae1bbf 100644

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

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

@@ -11,6 +11,7 @@

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

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

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

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

#include "chrome/browser/ui/cocoa/event_utils.h"

#include "webkit/glue/window_open_disposition.h"

@@ -39,7 +40,8 @@

// just load the URL.

TabRestoreService* service = bridge_->profile()->GetTabRestoreService();

if (node->session_id && service) {

- service->RestoreEntryById(browser, node->session_id, false);

+ service->RestoreEntryById(browser->tab_restore_service_delegate(),

+ node->session_id, false);

} else {

DCHECK(node->url.is_valid());

browser->OpenURL(node->url, GURL(), disposition,