| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 #include "ios/chrome/browser/favicon/ios_chrome_favicon_loader_factory.h" | 55 #include "ios/chrome/browser/favicon/ios_chrome_favicon_loader_factory.h" |
| 56 #import "ios/chrome/browser/find_in_page/find_in_page_controller.h" | 56 #import "ios/chrome/browser/find_in_page/find_in_page_controller.h" |
| 57 #import "ios/chrome/browser/find_in_page/find_in_page_model.h" | 57 #import "ios/chrome/browser/find_in_page/find_in_page_model.h" |
| 58 #import "ios/chrome/browser/find_in_page/find_tab_helper.h" | 58 #import "ios/chrome/browser/find_in_page/find_tab_helper.h" |
| 59 #include "ios/chrome/browser/first_run/first_run.h" | 59 #include "ios/chrome/browser/first_run/first_run.h" |
| 60 #import "ios/chrome/browser/geolocation/omnibox_geolocation_controller.h" | 60 #import "ios/chrome/browser/geolocation/omnibox_geolocation_controller.h" |
| 61 #include "ios/chrome/browser/infobars/infobar_container_ios.h" | 61 #include "ios/chrome/browser/infobars/infobar_container_ios.h" |
| 62 #include "ios/chrome/browser/infobars/infobar_container_view.h" | 62 #include "ios/chrome/browser/infobars/infobar_container_view.h" |
| 63 #import "ios/chrome/browser/metrics/new_tab_page_uma.h" | 63 #import "ios/chrome/browser/metrics/new_tab_page_uma.h" |
| 64 #include "ios/chrome/browser/metrics/tab_usage_recorder.h" | 64 #include "ios/chrome/browser/metrics/tab_usage_recorder.h" |
| 65 #import "ios/chrome/browser/native_app_launcher/native_app_navigation_controller
.h" | |
| 66 #import "ios/chrome/browser/open_url_util.h" | 65 #import "ios/chrome/browser/open_url_util.h" |
| 67 #import "ios/chrome/browser/passwords/password_controller.h" | 66 #import "ios/chrome/browser/passwords/password_controller.h" |
| 68 #include "ios/chrome/browser/pref_names.h" | 67 #include "ios/chrome/browser/pref_names.h" |
| 69 #include "ios/chrome/browser/reading_list/offline_url_utils.h" | 68 #include "ios/chrome/browser/reading_list/offline_url_utils.h" |
| 70 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h" | 69 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h" |
| 71 #include "ios/chrome/browser/search_engines/template_url_service_factory.h" | 70 #include "ios/chrome/browser/search_engines/template_url_service_factory.h" |
| 72 #include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h" | 71 #include "ios/chrome/browser/sessions/ios_chrome_tab_restore_service_factory.h" |
| 73 #include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.h" | 72 #include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios.h" |
| 74 #include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios_fact
ory.h" | 73 #include "ios/chrome/browser/sessions/tab_restore_service_delegate_impl_ios_fact
ory.h" |
| 75 #import "ios/chrome/browser/snapshots/snapshot_cache.h" | 74 #import "ios/chrome/browser/snapshots/snapshot_cache.h" |
| (...skipping 3683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3759 Tab* newTab = LegacyTabHelper::GetTabForWebState(newWebState.get()); | 3758 Tab* newTab = LegacyTabHelper::GetTabForWebState(newWebState.get()); |
| 3760 DCHECK(oldTab); | 3759 DCHECK(oldTab); |
| 3761 DCHECK(newTab); | 3760 DCHECK(newTab); |
| 3762 | 3761 |
| 3763 bool canPruneItems = | 3762 bool canPruneItems = |
| 3764 [newTab navigationManager]->CanPruneAllButLastCommittedItem(); | 3763 [newTab navigationManager]->CanPruneAllButLastCommittedItem(); |
| 3765 | 3764 |
| 3766 if (oldTab && newTab && canPruneItems) { | 3765 if (oldTab && newTab && canPruneItems) { |
| 3767 [newTab navigationManager]->CopyStateFromAndPrune( | 3766 [newTab navigationManager]->CopyStateFromAndPrune( |
| 3768 [oldTab navigationManager]); | 3767 [oldTab navigationManager]); |
| 3769 [[newTab nativeAppNavigationController] | |
| 3770 copyStateFrom:[oldTab nativeAppNavigationController]]; | |
| 3771 | 3768 |
| 3772 [_model webStateList]->ReplaceWebStateAt([_model indexOfTab:oldTab], | 3769 [_model webStateList]->ReplaceWebStateAt([_model indexOfTab:oldTab], |
| 3773 std::move(newWebState)); | 3770 std::move(newWebState)); |
| 3774 | 3771 |
| 3775 // Set isPrerenderTab to NO after replacing the tab. This will allow the | 3772 // Set isPrerenderTab to NO after replacing the tab. This will allow the |
| 3776 // BrowserViewController to detect that a pre-rendered tab is switched in, | 3773 // BrowserViewController to detect that a pre-rendered tab is switched in, |
| 3777 // and show the prerendering animation. | 3774 // and show the prerendering animation. |
| 3778 newTab.isPrerenderTab = NO; | 3775 newTab.isPrerenderTab = NO; |
| 3779 | 3776 |
| 3780 [self tabLoadComplete:newTab withSuccess:newTab.loadFinished]; | 3777 [self tabLoadComplete:newTab withSuccess:newTab.loadFinished]; |
| (...skipping 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5245 | 5242 |
| 5246 - (UIView*)voiceSearchButton { | 5243 - (UIView*)voiceSearchButton { |
| 5247 return _voiceSearchButton; | 5244 return _voiceSearchButton; |
| 5248 } | 5245 } |
| 5249 | 5246 |
| 5250 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { | 5247 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { |
| 5251 return [self currentLogoAnimationControllerOwner]; | 5248 return [self currentLogoAnimationControllerOwner]; |
| 5252 } | 5249 } |
| 5253 | 5250 |
| 5254 @end | 5251 @end |
| OLD | NEW |