ios/chrome/browser/ui/browser_view_controller.mm - Issue 2775943002: Revert of [ios] Switches ToolbarModelDelegateIOS to use WebStateList.

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: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2775943002: Revert of [ios] Switches ToolbarModelDelegateIOS to use WebStateList. (Closed)

Patch Set: Created 3 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: ios/chrome/browser/ui/browser_view_controller.mm

diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm

index bc134e2e27b775de7a662fdbbd5712ff3e826430..ef374666ca2d13cdd74fe36863d5251e548d556c 100644

--- a/ios/chrome/browser/ui/browser_view_controller.mm

+++ b/ios/chrome/browser/ui/browser_view_controller.mm

@@ -1719,8 +1719,7 @@

}

// Create the toolbar model and controller.

- _toolbarModelDelegate.reset(

- new ToolbarModelDelegateIOS([_model webStateList]));

+ _toolbarModelDelegate.reset(new ToolbarModelDelegateIOS(_model));

_toolbarModelIOS.reset([_dependencyFactory

newToolbarModelIOSWithDelegate:_toolbarModelDelegate.get()]);

_toolbarController.reset([_dependencyFactory