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

Side by Side Diff: ios/chrome/app/main_controller.mm

Issue 2883323002: [ios] Fix clean shutdown of Chrome on iOS. (Closed)
Patch Set: Rebase on origin/master. 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
« no previous file with comments | « no previous file | ios/chrome/app/spotlight/topsites_spotlight_manager.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 afterDelay:delay]; 947 afterDelay:delay];
948 } 948 }
949 949
950 - (void)activateFirstUserActionRecorderWithBackgroundTime: 950 - (void)activateFirstUserActionRecorderWithBackgroundTime:
951 (NSTimeInterval)backgroundTime { 951 (NSTimeInterval)backgroundTime {
952 base::TimeDelta delta = base::TimeDelta::FromSeconds(backgroundTime); 952 base::TimeDelta delta = base::TimeDelta::FromSeconds(backgroundTime);
953 _firstUserActionRecorder.reset(new FirstUserActionRecorder(delta)); 953 _firstUserActionRecorder.reset(new FirstUserActionRecorder(delta));
954 } 954 }
955 955
956 - (void)stopChromeMain { 956 - (void)stopChromeMain {
957 _spotlightManager.reset();
958 _browserViewWrangler.reset();
957 _chromeMain.reset(); 959 _chromeMain.reset();
958 } 960 }
959 961
960 - (BOOL)isTabSwitcherActive { 962 - (BOOL)isTabSwitcherActive {
961 return _tabSwitcherIsActive; 963 return _tabSwitcherIsActive;
962 } 964 }
963 965
964 #pragma mark - BrowserViewInformation implementation. 966 #pragma mark - BrowserViewInformation implementation.
965 967
966 - (void)haltAllTabs { 968 - (void)haltAllTabs {
(...skipping 1659 matching lines...) Expand 10 before | Expand all | Expand 10 after
2626 }; 2628 };
2627 2629
2628 callbackCounter->IncrementCount(); 2630 callbackCounter->IncrementCount();
2629 [self removeBrowsingDataFromBrowserState:_mainBrowserState 2631 [self removeBrowsingDataFromBrowserState:_mainBrowserState
2630 mask:removeAllMask 2632 mask:removeAllMask
2631 timePeriod:browsing_data::TimePeriod::ALL_TIME 2633 timePeriod:browsing_data::TimePeriod::ALL_TIME
2632 completionHandler:decrementCallbackCounterCount]; 2634 completionHandler:decrementCallbackCounterCount];
2633 } 2635 }
2634 2636
2635 @end 2637 @end
OLDNEW
« no previous file with comments | « no previous file | ios/chrome/app/spotlight/topsites_spotlight_manager.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698