| 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 4596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4607 } | 4607 } |
| 4608 | 4608 |
| 4609 // Observer method, tab replaced. | 4609 // Observer method, tab replaced. |
| 4610 - (void)tabModel:(TabModel*)model | 4610 - (void)tabModel:(TabModel*)model |
| 4611 didReplaceTab:(Tab*)oldTab | 4611 didReplaceTab:(Tab*)oldTab |
| 4612 withTab:(Tab*)newTab | 4612 withTab:(Tab*)newTab |
| 4613 atIndex:(NSUInteger)index { | 4613 atIndex:(NSUInteger)index { |
| 4614 [self uninstallDelegatesForTab:oldTab]; | 4614 [self uninstallDelegatesForTab:oldTab]; |
| 4615 [self installDelegatesForTab:newTab]; | 4615 [self installDelegatesForTab:newTab]; |
| 4616 | 4616 |
| 4617 if (_infoBarContainer) { |
| 4618 infobars::InfoBarManager* infoBarManager = [newTab infoBarManager]; |
| 4619 _infoBarContainer->ChangeInfoBarManager(infoBarManager); |
| 4620 } |
| 4621 |
| 4617 // Add |newTab|'s view to the hierarchy if it's the current Tab. | 4622 // Add |newTab|'s view to the hierarchy if it's the current Tab. |
| 4618 if (self.active && model.currentTab == newTab) | 4623 if (self.active && model.currentTab == newTab) |
| 4619 [self displayTab:newTab isNewSelection:NO]; | 4624 [self displayTab:newTab isNewSelection:NO]; |
| 4620 } | 4625 } |
| 4621 | 4626 |
| 4622 // A tab has been removed, remove its views from display if necessary. | 4627 // A tab has been removed, remove its views from display if necessary. |
| 4623 - (void)tabModel:(TabModel*)model | 4628 - (void)tabModel:(TabModel*)model |
| 4624 didRemoveTab:(Tab*)tab | 4629 didRemoveTab:(Tab*)tab |
| 4625 atIndex:(NSUInteger)index { | 4630 atIndex:(NSUInteger)index { |
| 4626 [self uninstallDelegatesForTab:tab]; | 4631 [self uninstallDelegatesForTab:tab]; |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5173 | 5178 |
| 5174 - (UIView*)voiceSearchButton { | 5179 - (UIView*)voiceSearchButton { |
| 5175 return _voiceSearchButton; | 5180 return _voiceSearchButton; |
| 5176 } | 5181 } |
| 5177 | 5182 |
| 5178 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { | 5183 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { |
| 5179 return [self currentLogoAnimationControllerOwner]; | 5184 return [self currentLogoAnimationControllerOwner]; |
| 5180 } | 5185 } |
| 5181 | 5186 |
| 5182 @end | 5187 @end |
| OLD | NEW |