Skip to content

GitLab

T
tangled
Commit 8c458fbe authored by Gauthier Ambard's avatar Gauthier Ambard Committed by Commit Bot
Browse files
Options

[iOS] Remove FindInPage legacy code 

This CL removes the code used by FindInPage pre-UI Refresh.

Bug: 800266, 879136
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I1b3ee786c19cebd54dc641fb7a7d71f5d4b1b8b6
Reviewed-on: https://chromium-review.googlesource.com/1233836
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: default avatarStepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592716}
parent 863fb9e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 1002 deletions
ios/chrome/browser/ui/find_bar/BUILD.gn
View file @ 8c458fbe
...@@ -9,31 +9,12 @@ source_set("find_bar") { ...@@ -9,31 +9,12 @@ source_set("find_bar") {
"find_bar_constants.mm", "find_bar_constants.mm",
"find_bar_controller_ios.h", "find_bar_controller_ios.h",
"find_bar_controller_ios.mm", "find_bar_controller_ios.mm",
"find_bar_touch_forwarding_view.h",
"find_bar_touch_forwarding_view.mm",
"find_bar_ui_element.h",
"find_bar_view.h", "find_bar_view.h",
"find_bar_view.mm", "find_bar_view.mm",
"legacy_find_bar_view.h",
"legacy_find_bar_view.mm",
] ]
deps = [ deps = [
"resources:find_bg",
"resources:find_close",
"resources:find_close_incognito",
"resources:find_close_pressed",
"resources:find_next", "resources:find_next",
"resources:find_next_disabled",
"resources:find_next_disabled_incognito",
"resources:find_next_incognito",
"resources:find_next_pressed",
"resources:find_next_pressed_incognito",
"resources:find_prev", "resources:find_prev",
"resources:find_prev_disabled",
"resources:find_prev_disabled_incognito",
"resources:find_prev_incognito",
"resources:find_prev_pressed",
"resources:find_prev_pressed_incognito",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//components/strings", "//components/strings",
......
ios/chrome/browser/ui/find_bar/find_bar_touch_forwarding_view.h deleted 100644 → 0
View file @ 863fb9e7
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_TOUCH_FORWARDING_VIEW_H_
#define IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_TOUCH_FORWARDING_VIEW_H_
#import <UIKit/UIKit.h>
// View that forwards all touch events inside itself to a given |targetView|.
@interface FindBarTouchForwardingView : UIView
// View to forward touch events to.
@property(nonatomic, weak) UIView* targetView;
@end
#endif // IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_TOUCH_FORWARDING_VIEW_H_
ios/chrome/browser/ui/find_bar/find_bar_touch_forwarding_view.mm deleted 100644 → 0
View file @ 863fb9e7
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "ios/chrome/browser/ui/find_bar/find_bar_touch_forwarding_view.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif
@implementation FindBarTouchForwardingView
@synthesize targetView = _targetView;
- (UIView*)hitTest:(CGPoint)point withEvent:(UIEvent*)event {
if (self.targetView && [self pointInside:point withEvent:event]) {
return self.targetView;
}
return [super hitTest:point withEvent:event];
}
@end
ios/chrome/browser/ui/find_bar/find_bar_ui_element.h deleted 100644 → 0
View file @ 863fb9e7
// Copyright 2018 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_UI_ELEMENT_H_
#define IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_UI_ELEMENT_H_
#import <UIKit/UIKit.h>
// TODO(crbug.com/800266): Merge this into FindBarView.
// Protocol for the UI Element of FindInPage. This protocol allows the new and
// old UI to share a common interface.
@protocol FindBarUIElement
// Updates |resultsLabel| with |text|. Updates |inputField| layout so that input
// text does not overlap with results count. |text| can be nil.
- (void)updateResultsLabelWithText:(NSString*)text;
// The textfield with search term.
@property(nonatomic, strong) UITextField* inputField;
// Button to go to previous search result.
@property(nonatomic, strong) UIButton* previousButton;
// Button to go to next search result.
@property(nonatomic, strong) UIButton* nextButton;
// Button to dismiss Find in Page.
@property(nonatomic, strong) UIButton* closeButton;
@end
#endif // IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_UI_ELEMENT_H_
ios/chrome/browser/ui/find_bar/find_bar_view.h
View file @ 8c458fbe
...@@ -7,12 +7,10 @@ ...@@ -7,12 +7,10 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "ios/chrome/browser/ui/find_bar/find_bar_ui_element.h"
// Find bar view. // Find bar view.
// It shows a textfield that hosts the search term, a label with results count // It shows a textfield that hosts the search term, a label with results count
// in format of "1 of 13", and next/previous/close buttons. // in format of "1 of 13", and next/previous/close buttons.
@interface FindBarView : UIView<FindBarUIElement> @interface FindBarView : UIView
// Designated initializer. |darkAppearance| makes the background to dark color // Designated initializer. |darkAppearance| makes the background to dark color
// and changes font colors to lighter colors. // and changes font colors to lighter colors.
...@@ -22,6 +20,19 @@ ...@@ -22,6 +20,19 @@
- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE; - (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
- (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE; - (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE;
// Updates |resultsLabel| with |text|. Updates |inputField| layout so that input
// text does not overlap with results count. |text| can be nil.
- (void)updateResultsLabelWithText:(NSString*)text;
// The textfield with search term.
@property(nonatomic, strong) UITextField* inputField;
// Button to go to previous search result.
@property(nonatomic, strong) UIButton* previousButton;
// Button to go to next search result.
@property(nonatomic, strong) UIButton* nextButton;
// Button to dismiss Find in Page.
@property(nonatomic, strong) UIButton* closeButton;
@end @end
#endif // IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_VIEW_H_ #endif // IOS_CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_VIEW_H_
ios/chrome/browser/ui/find_bar/find_bar_view.mm
View file @ 8c458fbe
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#include "components/strings/grit/components_strings.h" #include "components/strings/grit/components_strings.h"
#import "ios/chrome/browser/ui/find_bar/find_bar_constants.h" #import "ios/chrome/browser/ui/find_bar/find_bar_constants.h"
#import "ios/chrome/browser/ui/find_bar/find_bar_touch_forwarding_view.h"
#import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h" #import "ios/chrome/browser/ui/toolbar/buttons/toolbar_constants.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h" #import "ios/chrome/browser/ui/uikit_ui_util.h"
#import "ios/chrome/common/ui_util/constraints_ui_util.h" #import "ios/chrome/common/ui_util/constraints_ui_util.h"
......
ios/chrome/browser/ui/find_bar/legacy_find_bar_view.h deleted 100644 → 0
View file @ 863fb9e7
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef IOS_CHROME_BROWSER_UI_FIND_BAR_LEGACY_FIND_BAR_VIEW_H_
#define IOS_CHROME_BROWSER_UI_FIND_BAR_LEGACY_FIND_BAR_VIEW_H_
#import <UIKit/UIKit.h>
#import "ios/chrome/browser/ui/find_bar/find_bar_ui_element.h"
// Find bar view.
// It shows a textfield that hosts the search term, a label with results count
// in format of "1 of 13", and next/previous/close buttons.
// TODO(crbug.com/800266):Remove this class.
@interface LegacyFindBarView : UIView<FindBarUIElement>
// Designated initializer.
// |darkAppearance| makes the background to dark color and changes font colors
// to lighter colors.
- (instancetype)initWithDarkAppearance:(BOOL)darkAppearance
NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
- (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE;
@end
#endif // IOS_CHROME_BROWSER_UI_FIND_BAR_LEGACY_FIND_BAR_VIEW_H_
ios/chrome/browser/ui/find_bar/legacy_find_bar_view.mm deleted 100644 → 0
View file @ 863fb9e7
This diff is collapsed.
ios/chrome/browser/ui/find_bar/resources/BUILD.gn
View file @ 8c458fbe
...@@ -4,50 +4,6 @@ ...@@ -4,50 +4,6 @@
import("//build/config/ios/asset_catalog.gni") import("//build/config/ios/asset_catalog.gni")
imageset("find_prev_disabled_incognito") {
sources = [
"find_prev_disabled_incognito.imageset/Contents.json",
"find_prev_disabled_incognito.imageset/find_prev_disabled_incognito.png",
"find_prev_disabled_incognito.imageset/find_prev_disabled_incognito@2x.png",
"find_prev_disabled_incognito.imageset/find_prev_disabled_incognito@3x.png",
]
}
imageset("find_bg") {
sources = [
"find_bg.imageset/Contents.json",
"find_bg.imageset/find_bg@2x~ipad.png",
"find_bg.imageset/find_bg~ipad.png",
]
}
imageset("find_next_incognito") {
sources = [
"find_next_incognito.imageset/Contents.json",
"find_next_incognito.imageset/find_next_incognito.png",
"find_next_incognito.imageset/find_next_incognito@2x.png",
"find_next_incognito.imageset/find_next_incognito@3x.png",
]
}
imageset("find_prev_pressed_incognito") {
sources = [
"find_prev_pressed_incognito.imageset/Contents.json",
"find_prev_pressed_incognito.imageset/find_prev_pressed_incognito.png",
"find_prev_pressed_incognito.imageset/find_prev_pressed_incognito@2x.png",
"find_prev_pressed_incognito.imageset/find_prev_pressed_incognito@3x.png",
]
}
imageset("find_prev_disabled") {
sources = [
"find_prev_disabled.imageset/Contents.json",
"find_prev_disabled.imageset/find_prev_disabled.png",
"find_prev_disabled.imageset/find_prev_disabled@2x.png",
"find_prev_disabled.imageset/find_prev_disabled@3x.png",
]
}
imageset("find_prev") { imageset("find_prev") {
sources = [ sources = [
"find_prev.imageset/Contents.json", "find_prev.imageset/Contents.json",
...@@ -57,78 +13,6 @@ imageset("find_prev") { ...@@ -57,78 +13,6 @@ imageset("find_prev") {
] ]
} }
imageset("find_prev_incognito") {
sources = [
"find_prev_incognito.imageset/Contents.json",
"find_prev_incognito.imageset/find_prev_incognito.png",
"find_prev_incognito.imageset/find_prev_incognito@2x.png",
"find_prev_incognito.imageset/find_prev_incognito@3x.png",
]
}
imageset("find_close") {
sources = [
"find_close.imageset/Contents.json",
"find_close.imageset/find_close.png",
"find_close.imageset/find_close@2x.png",
"find_close.imageset/find_close@3x.png",
]
}
imageset("find_close_incognito") {
sources = [
"find_close_incognito.imageset/Contents.json",
"find_close_incognito.imageset/find_close_incognito.png",
"find_close_incognito.imageset/find_close_incognito@2x.png",
"find_close_incognito.imageset/find_close_incognito@3x.png",
]
}
imageset("find_prev_pressed") {
sources = [
"find_prev_pressed.imageset/Contents.json",
"find_prev_pressed.imageset/find_prev_pressed.png",
"find_prev_pressed.imageset/find_prev_pressed@2x.png",
"find_prev_pressed.imageset/find_prev_pressed@3x.png",
]
}
imageset("find_close_pressed") {
sources = [
"find_close_pressed.imageset/Contents.json",
"find_close_pressed.imageset/find_close_pressed.png",
"find_close_pressed.imageset/find_close_pressed@2x.png",
"find_close_pressed.imageset/find_close_pressed@3x.png",
]
}
imageset("find_next_disabled") {
sources = [
"find_next_disabled.imageset/Contents.json",
"find_next_disabled.imageset/find_next_disabled.png",
"find_next_disabled.imageset/find_next_disabled@2x.png",
"find_next_disabled.imageset/find_next_disabled@3x.png",
]
}
imageset("find_next_disabled_incognito") {
sources = [
"find_next_disabled_incognito.imageset/Contents.json",
"find_next_disabled_incognito.imageset/find_next_disabled_incognito.png",
"find_next_disabled_incognito.imageset/find_next_disabled_incognito@2x.png",
"find_next_disabled_incognito.imageset/find_next_disabled_incognito@3x.png",
]
}
imageset("find_next_pressed_incognito") {
sources = [
"find_next_pressed_incognito.imageset/Contents.json",
"find_next_pressed_incognito.imageset/find_next_pressed_incognito.png",
"find_next_pressed_incognito.imageset/find_next_pressed_incognito@2x.png",
"find_next_pressed_incognito.imageset/find_next_pressed_incognito@3x.png",
]
}
imageset("find_next") { imageset("find_next") {
sources = [ sources = [
"find_next.imageset/Contents.json", "find_next.imageset/Contents.json",
...@@ -137,12 +21,3 @@ imageset("find_next") { ...@@ -137,12 +21,3 @@ imageset("find_next") {
"find_next.imageset/find_next@3x.png", "find_next.imageset/find_next@3x.png",
] ]
} }
imageset("find_next_pressed") {
sources = [
"find_next_pressed.imageset/Contents.json",
"find_next_pressed.imageset/find_next_pressed.png",
"find_next_pressed.imageset/find_next_pressed@2x.png",
"find_next_pressed.imageset/find_next_pressed@3x.png",
]
}
ios/chrome/browser/ui/find_bar/resources/find_bg.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "ipad",
"scale": "2x",
"filename": "find_bg@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "find_bg~ipad.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_close.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_close.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_close@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_close@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_close_incognito.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_close_incognito.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_close_incognito@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_close_incognito@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_close_pressed.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_close_pressed.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_close_pressed@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_close_pressed@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_next_disabled.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_next_disabled.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_next_disabled@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_next_disabled@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_next_disabled_incognito.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_next_disabled_incognito.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_next_disabled_incognito@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_next_disabled_incognito@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_next_incognito.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_next_incognito.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_next_incognito@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_next_incognito@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_next_pressed.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_next_pressed.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_next_pressed@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_next_pressed@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_next_pressed_incognito.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_next_pressed_incognito.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_next_pressed_incognito@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_next_pressed_incognito@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_prev_disabled.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_prev_disabled.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_prev_disabled@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_prev_disabled@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_prev_disabled_incognito.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_prev_disabled_incognito.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_prev_disabled_incognito@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_prev_disabled_incognito@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_prev_incognito.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_prev_incognito.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_prev_incognito@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_prev_incognito@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_prev_pressed.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_prev_pressed.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_prev_pressed@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_prev_pressed@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
ios/chrome/browser/ui/find_bar/resources/find_prev_pressed_incognito.imageset/Contents.json deleted 100644 → 0
View file @ 863fb9e7
{
"images": [
{
"idiom": "universal",
"scale": "1x",
"filename": "find_prev_pressed_incognito.png"
},
{
"idiom": "universal",
"scale": "2x",
"filename": "find_prev_pressed_incognito@2x.png"
},
{
"idiom": "universal",
"scale": "3x",
"filename": "find_prev_pressed_incognito@3x.png"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment