Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Side by Side 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:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/browser/ui/browser_view_controller.h" 5 #import "ios/chrome/browser/ui/browser_view_controller.h"
6 6
7 #import <AssetsLibrary/AssetsLibrary.h> 7 #import <AssetsLibrary/AssetsLibrary.h>
8 #import <MobileCoreServices/MobileCoreServices.h> 8 #import <MobileCoreServices/MobileCoreServices.h>
9 #import <PassKit/PassKit.h> 9 #import <PassKit/PassKit.h>
10 #import <Photos/Photos.h> 10 #import <Photos/Photos.h>
(...skipping 1701 matching lines...) Expand 10 before | Expand all | Expand 10 after
1712 DCHECK([self isViewLoaded]); 1712 DCHECK([self isViewLoaded]);
1713 DCHECK(!_toolbarModelDelegate); 1713 DCHECK(!_toolbarModelDelegate);
1714 1714
1715 // Create the preload controller before the toolbar controller. 1715 // Create the preload controller before the toolbar controller.
1716 if (!_preloadController) { 1716 if (!_preloadController) {
1717 _preloadController.reset([_dependencyFactory newPreloadController]); 1717 _preloadController.reset([_dependencyFactory newPreloadController]);
1718 [_preloadController setDelegate:self]; 1718 [_preloadController setDelegate:self];
1719 } 1719 }
1720 1720
1721 // Create the toolbar model and controller. 1721 // Create the toolbar model and controller.
1722 _toolbarModelDelegate.reset( 1722 _toolbarModelDelegate.reset(new ToolbarModelDelegateIOS(_model));
1723 new ToolbarModelDelegateIOS([_model webStateList]));
1724 _toolbarModelIOS.reset([_dependencyFactory 1723 _toolbarModelIOS.reset([_dependencyFactory
1725 newToolbarModelIOSWithDelegate:_toolbarModelDelegate.get()]); 1724 newToolbarModelIOSWithDelegate:_toolbarModelDelegate.get()]);
1726 _toolbarController.reset([_dependencyFactory 1725 _toolbarController.reset([_dependencyFactory
1727 newWebToolbarControllerWithDelegate:self 1726 newWebToolbarControllerWithDelegate:self
1728 urlLoader:self 1727 urlLoader:self
1729 preloadProvider:_preloadController.get()]); 1728 preloadProvider:_preloadController.get()]);
1730 [_toolbarController setTabCount:[_model count]]; 1729 [_toolbarController setTabCount:[_model count]];
1731 if (_voiceSearchController.get()) 1730 if (_voiceSearchController.get())
1732 _voiceSearchController->SetDelegate(_toolbarController); 1731 _voiceSearchController->SetDelegate(_toolbarController);
1733 1732
(...skipping 3384 matching lines...) Expand 10 before | Expand all | Expand 10 after
5118 5117
5119 - (UIView*)voiceSearchButton { 5118 - (UIView*)voiceSearchButton {
5120 return _voiceSearchButton; 5119 return _voiceSearchButton;
5121 } 5120 }
5122 5121
5123 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { 5122 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
5124 return [self currentLogoAnimationControllerOwner]; 5123 return [self currentLogoAnimationControllerOwner];
5125 } 5124 }
5126 5125
5127 @end 5126 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/BUILD.gn ('k') | ios/chrome/browser/ui/browser_view_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698