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

Side by Side Diff: ios/chrome/app/main_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/app/main_controller.h" 5 #import "ios/chrome/app/main_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #import <CoreSpotlight/CoreSpotlight.h> 10 #import <CoreSpotlight/CoreSpotlight.h>
(...skipping 1959 matching lines...) Expand 10 before | Expand all | Expand 10 after
1970 } 1970 }
1971 1971
1972 - (void)showSettings { 1972 - (void)showSettings {
1973 if (_settingsNavigationController) 1973 if (_settingsNavigationController)
1974 return; 1974 return;
1975 [[DeferredInitializationRunner sharedInstance] 1975 [[DeferredInitializationRunner sharedInstance]
1976 runBlockIfNecessary:kPrefObserverInit]; 1976 runBlockIfNecessary:kPrefObserverInit];
1977 DCHECK(_localStatePrefObserverBridge); 1977 DCHECK(_localStatePrefObserverBridge);
1978 _settingsNavigationController.reset([SettingsNavigationController 1978 _settingsNavigationController.reset([SettingsNavigationController
1979 newSettingsMainControllerWithMainBrowserState:_mainBrowserState 1979 newSettingsMainControllerWithMainBrowserState:_mainBrowserState
1980 currentBrowserState:self.currentBrowserState
1981 delegate:self]); 1980 delegate:self]);
1982 [[self topPresentedViewController] 1981 [[self topPresentedViewController]
1983 presentViewController:_settingsNavigationController 1982 presentViewController:_settingsNavigationController
1984 animated:YES 1983 animated:YES
1985 completion:nil]; 1984 completion:nil];
1986 } 1985 }
1987 1986
1988 - (void)showAccountsSettings { 1987 - (void)showAccountsSettings {
1989 if (_settingsNavigationController) 1988 if (_settingsNavigationController)
1990 return; 1989 return;
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
2627 }; 2626 };
2628 2627
2629 callbackCounter->IncrementCount(); 2628 callbackCounter->IncrementCount();
2630 [self removeBrowsingDataFromBrowserState:_mainBrowserState 2629 [self removeBrowsingDataFromBrowserState:_mainBrowserState
2631 mask:removeAllMask 2630 mask:removeAllMask
2632 timePeriod:browsing_data::TimePeriod::ALL_TIME 2631 timePeriod:browsing_data::TimePeriod::ALL_TIME
2633 completionHandler:decrementCallbackCounterCount]; 2632 completionHandler:decrementCallbackCounterCount];
2634 } 2633 }
2635 2634
2636 @end 2635 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698