chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h - Issue 74653002: sync: Add --enable-sync-sessions-v2 and necessary plumbing to use SessionsSyncManager.

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.h

Issue 74653002: sync: Add --enable-sync-sessions-v2 and necessary plumbing to use SessionsSyncManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup components factory Created 7 years, 1 month 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

« chrome/browser/sync/profile_sync_service.h ('K') | « chrome/browser/sync/test/integration/sessions_helper.cc ('k') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.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.h

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

index 3dbbc72bfc8add95f871d2fb707e5b372a1f5e21..0740ce7bd81fd8d11e7ddf6e6a91b696a8109e37 100644

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

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

@@ -20,7 +20,7 @@ class Browser;

struct SessionTab;

namespace browser_sync {

-class SessionModelAssociator;

+class OpenTabsUIDelegate;

}

namespace chrome {

@@ -47,11 +47,11 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,

static const int kRecentlyClosedHeaderCommandId;

static const int kDisabledRecentlyClosedHeaderCommandId;

- // If |associator| is NULL, default associator for |browser|'s profile will

- // be used. Testing may require a specific |associator|.

+ // If |delegate| is NULL, default delegate for |browser|'s profile will

+ // be used. Testing may require a specific |delegate|.

RecentTabsSubMenuModel(ui::AcceleratorProvider* accelerator_provider,

Browser* browser,

- browser_sync::SessionModelAssociator* associator);

+ browser_sync::OpenTabsUIDelegate* delegate);

virtual ~RecentTabsSubMenuModel();

// Overridden from ui::SimpleMenuModel::Delegate:

@@ -117,7 +117,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,

// TabNavigationItems, and returns the corresponding local or other devices'

// TabNavigationItems in |tab_items|.

int CommandIdToTabVectorIndex(int command_id, TabNavigationItems** tab_items);

- browser_sync::SessionModelAssociator* GetModelAssociator();

+ browser_sync::OpenTabsUIDelegate* GetOpenTabsUIDelegate();

// Overridden from TabRestoreServiceObserver:

virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;

@@ -125,7 +125,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel,

Browser* browser_; // Weak.

- browser_sync::SessionModelAssociator* associator_; // Weak.

+ browser_sync::OpenTabsUIDelegate* open_tabs_; // Weak.

// Accelerator for reopening last closed tab.

ui::Accelerator reopen_closed_tab_accelerator_;