| 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 3665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3676 [oldTab recordStateInHistory]; | 3676 [oldTab recordStateInHistory]; |
| 3677 DCHECK([newTab navigationManager]); | 3677 DCHECK([newTab navigationManager]); |
| 3678 CRWSessionController* newHistory = | 3678 CRWSessionController* newHistory = |
| 3679 [newTab navigationManager]->GetSessionController(); | 3679 [newTab navigationManager]->GetSessionController(); |
| 3680 DCHECK([oldTab navigationManager]); | 3680 DCHECK([oldTab navigationManager]); |
| 3681 CRWSessionController* oldHistory = | 3681 CRWSessionController* oldHistory = |
| 3682 [oldTab navigationManager]->GetSessionController(); | 3682 [oldTab navigationManager]->GetSessionController(); |
| 3683 [newHistory insertStateFromSessionController:oldHistory]; | 3683 [newHistory insertStateFromSessionController:oldHistory]; |
| 3684 [[newTab nativeAppNavigationController] | 3684 [[newTab nativeAppNavigationController] |
| 3685 copyStateFrom:[oldTab nativeAppNavigationController]]; | 3685 copyStateFrom:[oldTab nativeAppNavigationController]]; |
| 3686 [_model replaceTab:oldTab withTab:newTab keepOldTabOpen:NO]; | 3686 [_model replaceTab:oldTab withTab:newTab]; |
| 3687 | 3687 |
| 3688 // Set isPrerenderTab to NO after replacing the tab. This will allow the | 3688 // Set isPrerenderTab to NO after replacing the tab. This will allow the |
| 3689 // BrowserViewController to detect that a pre-rendered tab is switched in, | 3689 // BrowserViewController to detect that a pre-rendered tab is switched in, |
| 3690 // and show the prerendering animation. | 3690 // and show the prerendering animation. |
| 3691 newTab.isPrerenderTab = NO; | 3691 newTab.isPrerenderTab = NO; |
| 3692 | 3692 |
| 3693 BOOL loadingFinished = | 3693 BOOL loadingFinished = |
| 3694 [newTab.webController loadPhase] == web::PAGE_LOADED; | 3694 [newTab.webController loadPhase] == web::PAGE_LOADED; |
| 3695 [self tabLoadComplete:newTab withSuccess:loadingFinished]; | 3695 [self tabLoadComplete:newTab withSuccess:loadingFinished]; |
| 3696 | 3696 |
| (...skipping 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5144 | 5144 |
| 5145 - (UIView*)voiceSearchButton { | 5145 - (UIView*)voiceSearchButton { |
| 5146 return _voiceSearchButton; | 5146 return _voiceSearchButton; |
| 5147 } | 5147 } |
| 5148 | 5148 |
| 5149 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { | 5149 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { |
| 5150 return [self currentLogoAnimationControllerOwner]; | 5150 return [self currentLogoAnimationControllerOwner]; |
| 5151 } | 5151 } |
| 5152 | 5152 |
| 5153 @end | 5153 @end |
| OLD | NEW |