Commit 28ab7b78 authored by Kurt Horimoto's avatar Kurt Horimoto Committed by Commit Bot

[iOS] Use ARC attributes for OverscrollActionView properties.

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ia3fbf9ce8af09ca056b6dfb890fe533ac9f65fe7
Reviewed-on: https://chromium-review.googlesource.com/1018001Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552098}
parent bc89217b
......@@ -46,7 +46,7 @@ enum class OverscrollStyle {
// The currently selected action.
@property(nonatomic, assign, readonly) OverscrollAction selectedAction;
// The view displayed has the background of the overscroll actions view.
@property(nonatomic, retain, readonly) UIView* backgroundView;
@property(nonatomic, strong, readonly) UIView* backgroundView;
// Whether cropping is set on the selection circle (true by default).
@property(nonatomic, assign) BOOL selectionCroppingEnabled;
......
......@@ -144,21 +144,21 @@ enum class OverscrollViewState {
@property(nonatomic, assign, readwrite) OverscrollAction selectedAction;
// Actions image views.
@property(nonatomic, retain) UIImageView* addTabActionImageView;
@property(nonatomic, retain) UIImageView* refreshActionImageView;
@property(nonatomic, retain) UIImageView* closeTabActionImageView;
@property(nonatomic, strong) UIImageView* addTabActionImageView;
@property(nonatomic, strong) UIImageView* refreshActionImageView;
@property(nonatomic, strong) UIImageView* closeTabActionImageView;
@property(nonatomic, retain) CALayer* highlightMaskLayer;
@property(nonatomic, strong) CALayer* highlightMaskLayer;
@property(nonatomic, retain) UIImageView* addTabActionImageViewHighlighted;
@property(nonatomic, retain) UIImageView* refreshActionImageViewHighlighted;
@property(nonatomic, retain) UIImageView* closeTabActionImageViewHighlighted;
@property(nonatomic, strong) UIImageView* addTabActionImageViewHighlighted;
@property(nonatomic, strong) UIImageView* refreshActionImageViewHighlighted;
@property(nonatomic, strong) UIImageView* closeTabActionImageViewHighlighted;
// The layer displaying the selection circle.
@property(nonatomic, retain) CAShapeLayer* selectionCircleLayer;
@property(nonatomic, strong) CAShapeLayer* selectionCircleLayer;
// Mask layer used to display highlighted states when the selection circle is
// above them.
@property(nonatomic, retain) CAShapeLayer* selectionCircleMaskLayer;
@property(nonatomic, strong) CAShapeLayer* selectionCircleMaskLayer;
// The current vertical offset.
@property(nonatomic, assign) CGFloat verticalOffset;
......@@ -167,13 +167,13 @@ enum class OverscrollViewState {
// The internal state of the OverscrollActionsView.
@property(nonatomic, assign) OverscrollViewState overscrollState;
// A shadow image view displayed at the bottom.
@property(nonatomic, retain) UIImageView* shadowView;
@property(nonatomic, strong) UIImageView* shadowView;
// Redefined to readwrite.
@property(nonatomic, retain, readwrite) UIView* backgroundView;
@property(nonatomic, strong, readwrite) UIView* backgroundView;
// Snapshot view added on top of the background image view.
@property(nonatomic, retain, readwrite) UIView* snapshotView;
@property(nonatomic, strong, readwrite) UIView* snapshotView;
// The parent layer on the selection circle used for cropping purpose.
@property(nonatomic, retain, readwrite) CALayer* selectionCircleCroppingLayer;
@property(nonatomic, strong, readwrite) CALayer* selectionCircleCroppingLayer;
// An absolute horizontal offset that also takes into account snapping.
- (CGFloat)absoluteHorizontalOffset;
......
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