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

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

Issue 2952273002: Revert "Remove workaround for strikethrough text in iOS omnibox" (Closed)
Patch Set: Created 3 years, 6 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/omnibox/omnibox_view_ios.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 (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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 base::scoped_nsobject<NSString> marked_text_before_change_; 167 base::scoped_nsobject<NSString> marked_text_before_change_;
168 NSRange current_selection_; 168 NSRange current_selection_;
169 NSRange old_selection_; 169 NSRange old_selection_;
170 170
171 // TODO(rohitrao): This is a monster hack, needed because closing the popup 171 // TODO(rohitrao): This is a monster hack, needed because closing the popup
172 // ends up inadvertently triggering a new round of autocomplete. Fix the 172 // ends up inadvertently triggering a new round of autocomplete. Fix the
173 // underlying problem, which is that textDidChange: is called when closing the 173 // underlying problem, which is that textDidChange: is called when closing the
174 // popup, and then remove this hack. b/5877366. 174 // popup, and then remove this hack. b/5877366.
175 BOOL ignore_popup_updates_; 175 BOOL ignore_popup_updates_;
176 176
177 // iOS 10.3 fails to apply the strikethrough style unless an extra style is
178 // also applied. See https://crbug.com/699702 for discussion.
179 BOOL use_strikethrough_workaround_;
180
177 // Bridges delegate method calls from |field_| to C++ land. 181 // Bridges delegate method calls from |field_| to C++ land.
178 base::scoped_nsobject<AutocompleteTextFieldDelegate> field_delegate_; 182 base::scoped_nsobject<AutocompleteTextFieldDelegate> field_delegate_;
179 183
180 // Temporary pointer to the attributed display string, stored as color and 184 // Temporary pointer to the attributed display string, stored as color and
181 // other emphasis attributes are applied by the superclass. 185 // other emphasis attributes are applied by the superclass.
182 NSMutableAttributedString* attributing_display_string_; // weak 186 NSMutableAttributedString* attributing_display_string_; // weak
183 }; 187 };
184 188
185 #endif // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_IOS_H_ 189 #endif // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_VIEW_IOS_H_
OLDNEW
« no previous file with comments | « no previous file | ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698