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

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

Issue 2629073003: Ensure PreloadController is deallocated. (Closed)
Patch Set: Created 3 years, 11 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/browser/ui/preload_controller.h » ('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/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 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1668 [self updateToolbarBackgroundAlpha:1.0]; 1668 [self updateToolbarBackgroundAlpha:1.0];
1669 [_contextualSearchController close]; 1669 [_contextualSearchController close];
1670 _contextualSearchController.reset(); 1670 _contextualSearchController.reset();
1671 [_contextualSearchPanel removeFromSuperview]; 1671 [_contextualSearchPanel removeFromSuperview];
1672 [_contextualSearchMask removeFromSuperview]; 1672 [_contextualSearchMask removeFromSuperview];
1673 [_paymentRequestManager close]; 1673 [_paymentRequestManager close];
1674 _paymentRequestManager.reset(); 1674 _paymentRequestManager.reset();
1675 BrowserListIOS::RemoveBrowser(self); 1675 BrowserListIOS::RemoveBrowser(self);
1676 [_toolbarController browserStateDestroyed]; 1676 [_toolbarController browserStateDestroyed];
1677 [_model browserStateDestroyed]; 1677 [_model browserStateDestroyed];
1678 [_preloadController browserStateDestroyed];
1679 _preloadController.reset();
1678 // The file remover needs the browser state, so needs to be destroyed now. 1680 // The file remover needs the browser state, so needs to be destroyed now.
1679 _externalFileRemover.reset(); 1681 _externalFileRemover.reset();
1680 _browserState = nullptr; 1682 _browserState = nullptr;
1681 } 1683 }
1682 1684
1683 - (void)installFakeStatusBar { 1685 - (void)installFakeStatusBar {
1684 if (IsIPadIdiom()) { 1686 if (IsIPadIdiom()) {
1685 CGFloat statusBarHeight = StatusBarHeight(); 1687 CGFloat statusBarHeight = StatusBarHeight();
1686 CGRect statusBarFrame = 1688 CGRect statusBarFrame =
1687 CGRectMake(0, 0, [[self view] frame].size.width, statusBarHeight); 1689 CGRectMake(0, 0, [[self view] frame].size.width, statusBarHeight);
(...skipping 3449 matching lines...) Expand 10 before | Expand all | Expand 10 after
5137 5139
5138 - (UIView*)voiceSearchButton { 5140 - (UIView*)voiceSearchButton {
5139 return _voiceSearchButton; 5141 return _voiceSearchButton;
5140 } 5142 }
5141 5143
5142 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner { 5144 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
5143 return [self currentLogoAnimationControllerOwner]; 5145 return [self currentLogoAnimationControllerOwner];
5144 } 5146 }
5145 5147
5146 @end 5148 @end
OLDNEW
« no previous file with comments | « no previous file | ios/chrome/browser/ui/preload_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698