| Index: ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
|
| diff --git a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
|
| index d4a463aac78cee4b80ce267107462a38bdf80ff8..2016efe8270631a77b1acb867e8788d8851dc10d 100644
|
| --- a/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
|
| +++ b/ios/chrome/browser/ui/overscroll_actions/overscroll_actions_controller.mm
|
| @@ -7,7 +7,6 @@
|
| #import <QuartzCore/QuartzCore.h>
|
|
|
| #include <algorithm>
|
| -#include "base/ios/ios_util.h"
|
| #include "base/logging.h"
|
| #include "base/mac/objc_property_releaser.h"
|
| #include "base/mac/scoped_nsobject.h"
|
| @@ -17,6 +16,7 @@
|
| #include "ios/chrome/browser/ui/rtl_geometry.h"
|
| #import "ios/chrome/browser/ui/toolbar/toolbar_controller.h"
|
| #import "ios/chrome/browser/ui/toolbar/web_toolbar_controller.h"
|
| +#include "ios/chrome/browser/ui/uikit_ui_util.h"
|
| #import "ios/chrome/browser/ui/voice/voice_search_notification_names.h"
|
| #import "ios/web/public/web_state/crw_web_view_proxy.h"
|
|
|
| @@ -652,26 +652,6 @@ NSString* const kOverscrollActionsDidEnd = @"OverscrollActionsDidStop";
|
| [self clear];
|
| }
|
|
|
| -// On iOS10 and above, trigger a haptic vibration for the user selecting an
|
| -// action. This is a no-op for devices that do not support it.
|
| -- (void)triggerHapticFeedbackForAction {
|
| - if (base::ios::IsRunningOnIOS10OrLater()) {
|
| - base::scoped_nsobject<UIImpactFeedbackGenerator> generator(
|
| - [[UIImpactFeedbackGenerator alloc] init]);
|
| - [generator impactOccurred];
|
| - }
|
| -}
|
| -
|
| -// On iOS10 and above, trigger a haptic vibration for the change in selection.
|
| -// This is a no-op for devices that do not support it.
|
| -- (void)triggerHapticFeedbackForSelectionChange {
|
| - if (base::ios::IsRunningOnIOS10OrLater()) {
|
| - base::scoped_nsobject<UISelectionFeedbackGenerator> generator(
|
| - [[UISelectionFeedbackGenerator alloc] init]);
|
| - [generator selectionChanged];
|
| - }
|
| -}
|
| -
|
| - (BOOL)isOverscrollActionEnabled {
|
| return _overscrollActionLock == 0 && _allowPullingActions &&
|
| !_isOverscrollActionsDisabledForLoading;
|
| @@ -700,7 +680,7 @@ NSString* const kOverscrollActionsDidEnd = @"OverscrollActionsDidStop";
|
| dispatch_async(dispatch_get_main_queue(), ^{
|
| [self recordMetricForTriggeredAction:self.overscrollActionView
|
| .selectedAction];
|
| - [self triggerHapticFeedbackForAction];
|
| + TriggerHapticFeedbackForAction();
|
| [self.delegate overscrollActionsController:self
|
| didTriggerAction:self.overscrollActionView
|
| .selectedAction];
|
| @@ -917,7 +897,7 @@ NSString* const kOverscrollActionsDidEnd = @"OverscrollActionsDidStop";
|
| [self scrollView].panGestureRecognizer.enabled = YES;
|
| [self startBounceWithInitialVelocity:CGPointZero];
|
|
|
| - [self triggerHapticFeedbackForAction];
|
| + TriggerHapticFeedbackForAction();
|
| [self.delegate
|
| overscrollActionsController:self
|
| didTriggerAction:self.overscrollActionView.selectedAction];
|
| @@ -925,7 +905,7 @@ NSString* const kOverscrollActionsDidEnd = @"OverscrollActionsDidStop";
|
|
|
| - (void)overscrollActionsView:(OverscrollActionsView*)view
|
| selectedActionDidChange:(OverscrollAction)newAction {
|
| - [self triggerHapticFeedbackForSelectionChange];
|
| + TriggerHapticFeedbackForSelectionChange();
|
| }
|
|
|
| @end
|
|
|