chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc - Issue 1342743002: Remove Profile and HostDesktopType dependencies from core TabRestore code

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/toolbar/recent_tabs_sub_menu_model.cc

Issue 1342743002: Remove Profile and HostDesktopType dependencies from core TabRestore code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Mac Created 5 years, 3 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/ui/cocoa/history_menu_bridge_unittest.mm ('k') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc

diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc

index 53a757b87f2e00aae72aa840f966e8cec0b3784c..3f86d5b7608239d391ef8d6bbb7ebfd5da51fc5a 100644

--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc

+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc

@@ -15,12 +15,12 @@

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

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

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

-#include "chrome/browser/sessions/tab_restore_service_delegate.h"

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

#include "chrome/browser/sync/profile_sync_service.h"

#include "chrome/browser/sync/profile_sync_service_factory.h"

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

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

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

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

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

#include "chrome/grit/generated_resources.h"

@@ -293,7 +293,7 @@ void RecentTabsSubMenuModel::ExecuteCommand(int command_id, int event_flags) {

TabRestoreService* service =

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

TabRestoreServiceDelegate* delegate =

- TabRestoreServiceDelegate::FindDelegateForWebContents(

+ BrowserTabRestoreServiceDelegate::FindDelegateForWebContents(

browser_->tab_strip_model()->GetActiveWebContents());

if (IsTabModelCommandId(command_id)) {

TabNavigationItems* tab_items = NULL;