Commit 4db3958c authored by Gauthier Ambard's avatar Gauthier Ambard Committed by Commit Bot

Clean up SideSwipeView

This CL cleans up the SideSwipeView, moving from trailing underscore
for ivar to leading underscore. It also moves the ivar declaration from
the public header to the private implementation.

Bug: none
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I4310bbb9a078668d96720fd01111d3522418a7bb
Reviewed-on: https://chromium-review.googlesource.com/887201
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532357}
parent e01e660f
...@@ -13,32 +13,7 @@ ...@@ -13,32 +13,7 @@
@protocol SideSwipeToolbarSnapshotProviding; @protocol SideSwipeToolbarSnapshotProviding;
@class TabModel; @class TabModel;
@interface SwipeView : UIView { @interface CardSideSwipeView : UIView
UIImageView* image_;
UIImageView* shadowView_;
}
@end
@interface CardSideSwipeView : UIView {
// The direction of the swipe that initiated this horizontal view.
UISwipeGestureRecognizerDirection direction_;
// Card views currently displayed.
SwipeView* leftCard_;
SwipeView* rightCard_;
// Most recent touch location.
CGPoint currentPoint_;
// Space reserved at the top for the toolbar.
CGFloat topMargin_;
// Tab model.
__weak TabModel* model_;
// The image view containing the background image.
UIImageView* backgroundView_;
}
@property(nonatomic, weak) id<SideSwipeControllerDelegate> delegate; @property(nonatomic, weak) id<SideSwipeControllerDelegate> delegate;
// Snapshot provider for the top toolbar. // Snapshot provider for the top toolbar.
...@@ -47,11 +22,12 @@ ...@@ -47,11 +22,12 @@
// Snapshot provider for the bottom toolbar. // Snapshot provider for the bottom toolbar.
@property(nonatomic, weak) id<SideSwipeToolbarSnapshotProviding> @property(nonatomic, weak) id<SideSwipeToolbarSnapshotProviding>
bottomToolbarSnapshotProvider; bottomToolbarSnapshotProvider;
// Space reserved at the top for the toolbar.
@property(nonatomic, assign) CGFloat topMargin; @property(nonatomic, assign) CGFloat topMargin;
- (id)initWithFrame:(CGRect)frame - (instancetype)initWithFrame:(CGRect)frame
topMargin:(CGFloat)margin topMargin:(CGFloat)margin
model:(TabModel*)model; model:(TabModel*)model;
- (void)updateViewsForDirection:(UISwipeGestureRecognizerDirection)direction; - (void)updateViewsForDirection:(UISwipeGestureRecognizerDirection)direction;
- (void)handleHorizontalPan:(SideSwipeGestureRecognizer*)gesture; - (void)handleHorizontalPan:(SideSwipeGestureRecognizer*)gesture;
......
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