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

Unified Diff: ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm

Issue 2933963002: [ios] Fix omnibox baseWritingDirection and dismissal iOS11 bugs. (Closed)
Patch Set: Add crbug 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/ui/omnibox/omnibox_popup_material_view_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
diff --git a/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm b/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
index 37b97b56fdec91ad5f42176ceed57ee808484f45..74d81a3d599500a4cd4c30904515ac0397d28fa8 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_text_field_ios.mm
@@ -7,6 +7,7 @@
#import <CoreText/CoreText.h>
#include "base/command_line.h"
+#include "base/ios/ios_util.h"
#include "base/logging.h"
#include "base/mac/foundation_util.h"
@@ -554,15 +555,19 @@ NSString* const kOmniboxFadeAnimationKey = @"OmniboxFadeAnimation";
NSTextAlignment alignment = [self bestTextAlignment];
[self setTextAlignment:alignment];
- UITextWritingDirection writingDirection =
- alignment == NSTextAlignmentLeft ? UITextWritingDirectionLeftToRight
- : UITextWritingDirectionRightToLeft;
- [self
- setBaseWritingDirection:writingDirection
- forRange:[self
- textRangeFromPosition:[self
- beginningOfDocument]
- toPosition:[self endOfDocument]]];
+ if (!base::ios::IsRunningOnIOS11OrLater()) {
+ // TODO(crbug.com/730461): Remove this entire block once it's been tested
+ // on trunk.
+ UITextWritingDirection writingDirection =
+ alignment == NSTextAlignmentLeft ? UITextWritingDirectionLeftToRight
+ : UITextWritingDirectionRightToLeft;
+ [self
+ setBaseWritingDirection:writingDirection
+ forRange:
+ [self
+ textRangeFromPosition:[self beginningOfDocument]
+ toPosition:[self endOfDocument]]];
+ }
}
- (void)setPlaceholder:(NSString*)placeholder {
« no previous file with comments | « ios/chrome/browser/ui/omnibox/omnibox_popup_material_view_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698