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

Side by Side Diff: ios/chrome/browser/ui/toolbar/web_toolbar_controller.mm

Issue 2851713002: Follow up from ARC conversion (Closed)
Patch Set: add __block 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 | « ios/chrome/browser/ui/toolbar/toolbar_controller.mm ('k') | no next file » | 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/toolbar/web_toolbar_controller.h" 5 #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
6 6
7 #import <CoreLocation/CoreLocation.h> 7 #import <CoreLocation/CoreLocation.h>
8 #include <QuartzCore/QuartzCore.h> 8 #include <QuartzCore/QuartzCore.h>
9 9
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 [_tabHistoryPopupController fadeInPopupFromSource:convertedOrigin 842 [_tabHistoryPopupController fadeInPopupFromSource:convertedOrigin
843 toDestination:destination]; 843 toDestination:destination];
844 [[NSNotificationCenter defaultCenter] 844 [[NSNotificationCenter defaultCenter]
845 postNotificationName:kTabHistoryPopupWillShowNotification 845 postNotificationName:kTabHistoryPopupWillShowNotification
846 object:nil]; 846 object:nil];
847 } 847 }
848 848
849 - (void)dismissTabHistoryPopup { 849 - (void)dismissTabHistoryPopup {
850 if (!_tabHistoryPopupController) 850 if (!_tabHistoryPopupController)
851 return; 851 return;
852 TabHistoryPopupController* tempTHPC = _tabHistoryPopupController; 852 __block TabHistoryPopupController* tempTHPC = _tabHistoryPopupController;
853 [tempTHPC containerView].userInteractionEnabled = NO; 853 [tempTHPC containerView].userInteractionEnabled = NO;
854 [tempTHPC dismissAnimatedWithCompletion:^{ 854 [tempTHPC dismissAnimatedWithCompletion:^{
855 // Unpress the back/forward button by restoring the normal and 855 // Unpress the back/forward button by restoring the normal and
856 // highlighted images to their usual state. 856 // highlighted images to their usual state.
857 [self setImagesForNavButton:_backButton withTabHistoryVisible:NO]; 857 [self setImagesForNavButton:_backButton withTabHistoryVisible:NO];
858 [self setImagesForNavButton:_forwardButton withTabHistoryVisible:NO]; 858 [self setImagesForNavButton:_forwardButton withTabHistoryVisible:NO];
859 // Reference tempTHPC so the block retains it. 859 // Reference tempTHPC so the block retains it.
860 [tempTHPC self]; 860 tempTHPC = nil;
861 }]; 861 }];
862 // reset _tabHistoryPopupController to prevent -applicationDidEnterBackground 862 // reset _tabHistoryPopupController to prevent -applicationDidEnterBackground
863 // from posting another kTabHistoryPopupWillHideNotification. 863 // from posting another kTabHistoryPopupWillHideNotification.
864 _tabHistoryPopupController = nil; 864 _tabHistoryPopupController = nil;
865 865
866 [[NSNotificationCenter defaultCenter] 866 [[NSNotificationCenter defaultCenter]
867 postNotificationName:kTabHistoryPopupWillHideNotification 867 postNotificationName:kTabHistoryPopupWillHideNotification
868 object:nil]; 868 object:nil];
869 } 869 }
870 870
(...skipping 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after
2571 2571
2572 - (BOOL)isPrerenderAnimationRunning { 2572 - (BOOL)isPrerenderAnimationRunning {
2573 return _prerenderAnimating; 2573 return _prerenderAnimating;
2574 } 2574 }
2575 2575
2576 - (OmniboxTextFieldIOS*)omnibox { 2576 - (OmniboxTextFieldIOS*)omnibox {
2577 return _omniBox; 2577 return _omniBox;
2578 } 2578 }
2579 2579
2580 @end 2580 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/toolbar/toolbar_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698