chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm - Issue 1310373009: [Sync] Remove static methods on SyncedWindowDelegate.

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/wrench_menu/wrench_menu_controller_unittest.mm

Issue 1310373009: [Sync] Remove static methods on SyncedWindowDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. 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/sync/sessions/synced_window_delegates_getter.cc ('k') | chrome/browser/ui/sync/browser_synced_window_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

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

index 4648ac5b0f0c2043b966014155b4fb55b187831f..57fa5f440358bffdd4229ed7a31cc81c2f0be7c1 100644

--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

@@ -17,6 +17,7 @@

#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

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

#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"

+#include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"

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

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

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

@@ -83,7 +84,9 @@ class WrenchMenuControllerTest

profile(),

local_device_.get(),

scoped_ptr<browser_sync::LocalSessionEventRouter>(

- new DummyRouter())));

+ new DummyRouter()),

+ scoped_ptr<browser_sync::SyncedWindowDelegatesGetter>(

+ new browser_sync::BrowserSyncedWindowDelegatesGetter())));

manager_->MergeDataAndStartSyncing(

syncer::SESSIONS,

syncer::SyncDataList(),