Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2894883004: Removed IsNativeAppLauncherEnabled() experiment (Closed)
Patch Set: rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 3643 matching lines...) Expand 10 before | Expand all | Expand 10 after
3719 Tab* newTab = LegacyTabHelper::GetTabForWebState(newWebState.get()); 3718 Tab* newTab = LegacyTabHelper::GetTabForWebState(newWebState.get());
3720 DCHECK(oldTab); 3719 DCHECK(oldTab);
3721 DCHECK(newTab); 3720 DCHECK(newTab);
3722 3721
3723 bool canPruneItems = 3722 bool canPruneItems =
3724 [newTab navigationManager]->CanPruneAllButLastCommittedItem(); 3723 [newTab navigationManager]->CanPruneAllButLastCommittedItem();
3725 3724
3726 if (oldTab && newTab && canPruneItems) { 3725 if (oldTab && newTab && canPruneItems) {
3727 [newTab navigationManager]->CopyStateFromAndPrune( 3726 [newTab navigationManager]->CopyStateFromAndPrune(
3728 [oldTab navigationManager]); 3727 [oldTab navigationManager]);
3729 [[newTab nativeAppNavigationController]
3730 copyStateFrom:[oldTab nativeAppNavigationController]];
3731 3728
3732 [_model webStateList]->ReplaceWebStateAt([_model indexOfTab:oldTab], 3729 [_model webStateList]->ReplaceWebStateAt([_model indexOfTab:oldTab],
3733 std::move(newWebState)); 3730 std::move(newWebState));
3734 3731
3735 // Set isPrerenderTab to NO after replacing the tab. This will allow the 3732 // Set isPrerenderTab to NO after replacing the tab. This will allow the
3736 // BrowserViewController to detect that a pre-rendered tab is switched in, 3733 // BrowserViewController to detect that a pre-rendered tab is switched in,
3737 // and show the prerendering animation. 3734 // and show the prerendering animation.
3738 newTab.isPrerenderTab = NO; 3735 newTab.isPrerenderTab = NO;
3739 3736
3740 [self tabLoadComplete:newTab withSuccess:newTab.loadFinished]; 3737 [self tabLoadComplete:newTab withSuccess:newTab.loadFinished];
(...skipping 1440 matching lines...) Expand 10 before | Expand all | Expand 10 after
5181 5178
5182 - (UIView*)voiceSearchButton { 5179 - (UIView*)voiceSearchButton {
5183 return _voiceSearchButton; 5180 return _voiceSearchButton;
5184 } 5181 }
5185 5182
5186 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { 5183 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
5187 return [self currentLogoAnimationControllerOwner]; 5184 return [self currentLogoAnimationControllerOwner];
5188 } 5185 }
5189 5186
5190 @end 5187 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698