| OLD | NEW |
| 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 1711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1722 preloadProvider:_preloadController.get()]); | 1722 preloadProvider:_preloadController.get()]); |
| 1723 [_toolbarController setTabCount:[_model count]]; | 1723 [_toolbarController setTabCount:[_model count]]; |
| 1724 if (_voiceSearchController.get()) | 1724 if (_voiceSearchController.get()) |
| 1725 _voiceSearchController->SetDelegate(_toolbarController); | 1725 _voiceSearchController->SetDelegate(_toolbarController); |
| 1726 | 1726 |
| 1727 // If needed, create the tabstrip. | 1727 // If needed, create the tabstrip. |
| 1728 if (IsIPadIdiom()) { | 1728 if (IsIPadIdiom()) { |
| 1729 _tabStripController.reset( | 1729 _tabStripController.reset( |
| 1730 [_dependencyFactory newTabStripControllerWithTabModel:_model]); | 1730 [_dependencyFactory newTabStripControllerWithTabModel:_model]); |
| 1731 _tabStripController.get().fullscreenDelegate = self; | 1731 _tabStripController.get().fullscreenDelegate = self; |
| 1732 [_tabStripController setHasTabSwitcherToggleSwitch:YES]; | |
| 1733 } | 1732 } |
| 1734 | 1733 |
| 1735 // Create infobar container. | 1734 // Create infobar container. |
| 1736 if (!_infoBarContainerDelegate) { | 1735 if (!_infoBarContainerDelegate) { |
| 1737 _infoBarContainerDelegate.reset(new InfoBarContainerDelegateIOS(self)); | 1736 _infoBarContainerDelegate.reset(new InfoBarContainerDelegateIOS(self)); |
| 1738 _infoBarContainer.reset( | 1737 _infoBarContainer.reset( |
| 1739 new InfoBarContainerIOS(_infoBarContainerDelegate.get())); | 1738 new InfoBarContainerIOS(_infoBarContainerDelegate.get())); |
| 1740 } | 1739 } |
| 1741 } | 1740 } |
| 1742 | 1741 |
| (...skipping 3273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5016 | 5015 |
| 5017 - (UIView*)voiceSearchButton { | 5016 - (UIView*)voiceSearchButton { |
| 5018 return _voiceSearchButton; | 5017 return _voiceSearchButton; |
| 5019 } | 5018 } |
| 5020 | 5019 |
| 5021 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { | 5020 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { |
| 5022 return [self currentLogoAnimationControllerOwner]; | 5021 return [self currentLogoAnimationControllerOwner]; |
| 5023 } | 5022 } |
| 5024 | 5023 |
| 5025 @end | 5024 @end |
| OLD | NEW |