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

Side by Side Diff: ios/chrome/browser/ui/omnibox/omnibox_view_ios.h

Issue 2707963002: [ObjC ARC] Converts ios/chrome/browser/ui/omnibox:omnibox_internal to ARC. (Closed)
Patch Set: weaks Created 3 years, 10 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_IOS_H_ 5 #ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_IOS_H_
6 #define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_IOS_H_ 6 #define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_IOS_H_
7 7
8 #import <UIKit/UIKit.h> 8 #import <UIKit/UIKit.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // voice search is not pending before attempting to process user actions that 146 // voice search is not pending before attempting to process user actions that
147 // may modify text field contents. 147 // may modify text field contents.
148 // TODO(crbug.com/303212): Remove this workaround once the crash is fixed. 148 // TODO(crbug.com/303212): Remove this workaround once the crash is fixed.
149 bool ShouldIgnoreUserInputDueToPendingVoiceSearch(); 149 bool ShouldIgnoreUserInputDueToPendingVoiceSearch();
150 150
151 ios::ChromeBrowserState* browser_state_; 151 ios::ChromeBrowserState* browser_state_;
152 152
153 base::scoped_nsobject<OmniboxTextFieldIOS> field_; 153 base::scoped_nsobject<OmniboxTextFieldIOS> field_;
154 WebOmniboxEditController* controller_; // weak, owns us 154 WebOmniboxEditController* controller_; // weak, owns us
155 std::unique_ptr<OmniboxPopupViewIOS> popup_view_; 155 std::unique_ptr<OmniboxPopupViewIOS> popup_view_;
156 id<PreloadProvider> preloader_; 156 __unsafe_unretained id<PreloadProvider>
157 preloader_; // Should be __weak but is included from non-ARC code.
rohitrao (ping after 24h) 2017/02/24 13:40:32 Same comment about moving the comment to its own l
stkhapugin 2017/03/01 17:43:58 Done.
157 158
158 State state_before_change_; 159 State state_before_change_;
159 base::scoped_nsobject<NSString> marked_text_before_change_; 160 base::scoped_nsobject<NSString> marked_text_before_change_;
160 NSRange current_selection_; 161 NSRange current_selection_;
161 NSRange old_selection_; 162 NSRange old_selection_;
162 163
163 // TODO(rohitrao): This is a monster hack, needed because closing the popup 164 // TODO(rohitrao): This is a monster hack, needed because closing the popup
164 // ends up inadvertently triggering a new round of autocomplete. Fix the 165 // ends up inadvertently triggering a new round of autocomplete. Fix the
165 // underlying problem, which is that textDidChange: is called when closing the 166 // underlying problem, which is that textDidChange: is called when closing the
166 // popup, and then remove this hack. b/5877366. 167 // popup, and then remove this hack. b/5877366.
167 BOOL ignore_popup_updates_; 168 BOOL ignore_popup_updates_;
168 169
169 // Bridges delegate method calls from |field_| to C++ land. 170 // Bridges delegate method calls from |field_| to C++ land.
170 base::scoped_nsobject<AutocompleteTextFieldDelegate> field_delegate_; 171 base::scoped_nsobject<AutocompleteTextFieldDelegate> field_delegate_;
171 }; 172 };
172 173
173 #endif // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_IOS_H_ 174 #endif // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_IOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698