| 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/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 1913 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1924 } | 1924 } |
| 1925 | 1925 |
| 1926 - (void)showSettings { | 1926 - (void)showSettings { |
| 1927 if (_settingsNavigationController) | 1927 if (_settingsNavigationController) |
| 1928 return; | 1928 return; |
| 1929 [[DeferredInitializationRunner sharedInstance] | 1929 [[DeferredInitializationRunner sharedInstance] |
| 1930 runBlockIfNecessary:kPrefObserverInit]; | 1930 runBlockIfNecessary:kPrefObserverInit]; |
| 1931 DCHECK(_localStatePrefObserverBridge); | 1931 DCHECK(_localStatePrefObserverBridge); |
| 1932 _settingsNavigationController = [SettingsNavigationController | 1932 _settingsNavigationController = [SettingsNavigationController |
| 1933 newSettingsMainControllerWithMainBrowserState:_mainBrowserState | 1933 newSettingsMainControllerWithMainBrowserState:_mainBrowserState |
| 1934 currentBrowserState:self.currentBrowserState | |
| 1935 delegate:self]; | 1934 delegate:self]; |
| 1936 [[self topPresentedViewController] | 1935 [[self topPresentedViewController] |
| 1937 presentViewController:_settingsNavigationController | 1936 presentViewController:_settingsNavigationController |
| 1938 animated:YES | 1937 animated:YES |
| 1939 completion:nil]; | 1938 completion:nil]; |
| 1940 } | 1939 } |
| 1941 | 1940 |
| 1942 - (void)showAccountsSettings { | 1941 - (void)showAccountsSettings { |
| 1943 if (_settingsNavigationController) | 1942 if (_settingsNavigationController) |
| 1944 return; | 1943 return; |
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2581 }; | 2580 }; |
| 2582 | 2581 |
| 2583 callbackCounter->IncrementCount(); | 2582 callbackCounter->IncrementCount(); |
| 2584 [self removeBrowsingDataFromBrowserState:_mainBrowserState | 2583 [self removeBrowsingDataFromBrowserState:_mainBrowserState |
| 2585 mask:removeAllMask | 2584 mask:removeAllMask |
| 2586 timePeriod:browsing_data::TimePeriod::ALL_TIME | 2585 timePeriod:browsing_data::TimePeriod::ALL_TIME |
| 2587 completionHandler:decrementCallbackCounterCount]; | 2586 completionHandler:decrementCallbackCounterCount]; |
| 2588 } | 2587 } |
| 2589 | 2588 |
| 2590 @end | 2589 @end |
| OLD | NEW |