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

Side by Side Diff: ios/chrome/browser/ui/history/history_search_view_controller.mm

Issue 2624963003: [ObjC ARC] Converts ios/chrome/browser/ui/history:history to ARC. (Closed)
Patch Set: Removes the rest of weak and scoped nsobjects. 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/history/history_search_view_controller.h" 5 #import "ios/chrome/browser/ui/history/history_search_view_controller.h"
6 6
7 #include "base/ios/weak_nsobject.h"
8 #include "base/mac/scoped_nsobject.h"
9 #import "ios/chrome/browser/ui/history/history_search_view.h" 7 #import "ios/chrome/browser/ui/history/history_search_view.h"
10 8
9 #if !defined(__has_feature) || !__has_feature(objc_arc)
10 #error "This file requires ARC support."
11 #endif
12
11 @interface HistorySearchViewController ()<UITextFieldDelegate> { 13 @interface HistorySearchViewController ()<UITextFieldDelegate> {
12 // Delegate for forwarding interactions with the search view.
13 base::WeakNSProtocol<id<HistorySearchViewControllerDelegate>> _delegate;
14 // View displayed by the HistorySearchViewController 14 // View displayed by the HistorySearchViewController
15 base::scoped_nsobject<HistorySearchView> _searchView; 15 HistorySearchView* _searchView;
16 } 16 }
17 17
18 // Action for the cancel button. 18 // Action for the cancel button.
19 - (void)cancelButtonClicked:(id)sender; 19 - (void)cancelButtonClicked:(id)sender;
20 20
21 @end 21 @end
22 22
23 @implementation HistorySearchViewController 23 @implementation HistorySearchViewController
24 24 @synthesize delegate = _delegate;
25 @synthesize enabled = _enabled; 25 @synthesize enabled = _enabled;
26 26
27 - (void)loadView { 27 - (void)loadView {
28 _searchView.reset([[HistorySearchView alloc] init]); 28 _searchView = [[HistorySearchView alloc] init];
29 [_searchView setSearchBarDelegate:self]; 29 [_searchView setSearchBarDelegate:self];
30 [_searchView setCancelTarget:self action:@selector(cancelButtonClicked:)]; 30 [_searchView setCancelTarget:self action:@selector(cancelButtonClicked:)];
31 self.view = _searchView; 31 self.view = _searchView;
32 } 32 }
33 33
34 - (void)viewDidAppear:(BOOL)animated { 34 - (void)viewDidAppear:(BOOL)animated {
35 [super viewDidAppear:animated]; 35 [super viewDidAppear:animated];
36 [_searchView becomeFirstResponder]; 36 [_searchView becomeFirstResponder];
37 } 37 }
38 38
39 - (void)setDelegate:(id<HistorySearchViewControllerDelegate>)delegate {
40 _delegate.reset(delegate);
41 }
42
43 - (id<HistorySearchViewControllerDelegate>)delegate {
44 return _delegate;
45 }
46
47 - (void)setEnabled:(BOOL)enabled { 39 - (void)setEnabled:(BOOL)enabled {
48 _enabled = enabled; 40 _enabled = enabled;
49 [_searchView setEnabled:enabled]; 41 [_searchView setEnabled:enabled];
50 } 42 }
51 43
52 - (void)cancelButtonClicked:(id)sender { 44 - (void)cancelButtonClicked:(id)sender {
53 [_searchView clearText]; 45 [_searchView clearText];
54 [_searchView endEditing:YES]; 46 [_searchView endEditing:YES];
55 [self.delegate historySearchViewControllerDidCancel:self]; 47 [self.delegate historySearchViewControllerDidCancel:self];
56 } 48 }
(...skipping 13 matching lines...) Expand all
70 [self.delegate historySearchViewController:self didRequestSearchForTerm:@""]; 62 [self.delegate historySearchViewController:self didRequestSearchForTerm:@""];
71 return YES; 63 return YES;
72 } 64 }
73 65
74 - (BOOL)textFieldShouldReturn:(UITextField*)textField { 66 - (BOOL)textFieldShouldReturn:(UITextField*)textField {
75 [textField resignFirstResponder]; 67 [textField resignFirstResponder];
76 return YES; 68 return YES;
77 } 69 }
78 70
79 @end 71 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/history/history_search_view.mm ('k') | ios/chrome/browser/ui/history/history_service_facade.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698