Chromium Code Reviews| 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 4605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4616 [_contextualSearchController enableContextualSearch:enableContextualSearch]; | 4616 [_contextualSearchController enableContextualSearch:enableContextualSearch]; |
| 4617 } | 4617 } |
| 4618 } | 4618 } |
| 4619 | 4619 |
| 4620 // Observer method, tab replaced. | 4620 // Observer method, tab replaced. |
| 4621 - (void)tabModel:(TabModel*)model | 4621 - (void)tabModel:(TabModel*)model |
| 4622 didReplaceTab:(Tab*)oldTab | 4622 didReplaceTab:(Tab*)oldTab |
| 4623 withTab:(Tab*)newTab | 4623 withTab:(Tab*)newTab |
| 4624 atIndex:(NSUInteger)index { | 4624 atIndex:(NSUInteger)index { |
| 4625 [self uninstallDelegatesForTab:oldTab]; | 4625 [self uninstallDelegatesForTab:oldTab]; |
| 4626 | |
| 4627 if (_infoBarContainer) { | |
| 4628 infobars::InfoBarManager* infoBarManager = [newTab infoBarManager]; | |
| 4629 _infoBarContainer->ChangeInfoBarManager(infoBarManager); | |
| 4630 } | |
| 4631 | |
| 4626 [self installDelegatesForTab:newTab]; | 4632 [self installDelegatesForTab:newTab]; |
|
rohitrao (ping after 24h)
2017/05/09 14:40:17
Does the new block of code need to come before |in
michaeldo
2017/05/09 21:12:46
I thought it did based on the other methods here,
| |
| 4627 | 4633 |
| 4628 // Add |newTab|'s view to the hierarchy if it's the current Tab. | 4634 // Add |newTab|'s view to the hierarchy if it's the current Tab. |
| 4629 if (self.active && model.currentTab == newTab) | 4635 if (self.active && model.currentTab == newTab) |
| 4630 [self displayTab:newTab isNewSelection:NO]; | 4636 [self displayTab:newTab isNewSelection:NO]; |
| 4631 } | 4637 } |
| 4632 | 4638 |
| 4633 // A tab has been removed, remove its views from display if necessary. | 4639 // A tab has been removed, remove its views from display if necessary. |
| 4634 - (void)tabModel:(TabModel*)model | 4640 - (void)tabModel:(TabModel*)model |
| 4635 didRemoveTab:(Tab*)tab | 4641 didRemoveTab:(Tab*)tab |
| 4636 atIndex:(NSUInteger)index { | 4642 atIndex:(NSUInteger)index { |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5184 | 5190 |
| 5185 - (UIView*)voiceSearchButton { | 5191 - (UIView*)voiceSearchButton { |
| 5186 return _voiceSearchButton; | 5192 return _voiceSearchButton; |
| 5187 } | 5193 } |
| 5188 | 5194 |
| 5189 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { | 5195 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { |
| 5190 return [self currentLogoAnimationControllerOwner]; | 5196 return [self currentLogoAnimationControllerOwner]; |
| 5191 } | 5197 } |
| 5192 | 5198 |
| 5193 @end | 5199 @end |
| OLD | NEW |