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

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

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/ui/omnibox/omnibox_view_ios.h ('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_view_ios.mm
diff --git a/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm b/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
index 3114bc7d51ee53811d96b7f5deaf647125d13a75..1eabef3394dda9f245f33bf0ed7a9b5d2db7cbca 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
@@ -10,6 +10,7 @@
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/ios/device_util.h"
+#include "base/ios/ios_util.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/user_metrics.h"
#include "base/metrics/user_metrics_action.h"
@@ -180,6 +181,7 @@ OmniboxViewIOS::OmniboxViewIOS(OmniboxTextFieldIOS* field,
[field_ addTarget:field_delegate_
action:@selector(textFieldDidChange:)
forControlEvents:UIControlEventEditingChanged];
+ use_strikethrough_workaround_ = base::ios::IsRunningOnOrLater(10, 3, 0);
}
OmniboxViewIOS::~OmniboxViewIOS() {
@@ -646,6 +648,15 @@ void OmniboxViewIOS::UpdateSchemeStyle(const gfx::Range& range) {
DCHECK_NE(security_state::SECURE_WITH_POLICY_INSTALLED_CERT, security_level);
if (security_level == security_state::DANGEROUS) {
+ if (use_strikethrough_workaround_) {
+ // Workaround: Add extra attribute to allow strikethough to apply on iOS
+ // 10.3+. See https://crbug.com/699702 for discussion.
+ [attributing_display_string_
+ addAttribute:NSBaselineOffsetAttributeName
+ value:@0
+ range:NSMakeRange(0, [attributing_display_string_ length])];
+ }
+
// Add a strikethrough through the scheme.
[attributing_display_string_
addAttribute:NSStrikethroughStyleAttributeName
« no previous file with comments | « ios/chrome/browser/ui/omnibox/omnibox_view_ios.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698