[ios] Remove forward swipe for reading list.

Bug: 909724
Change-Id: I24c3341ca5245d599ce43cba8b17c164e38e3618
Reviewed-on: https://chromium-review.googlesource.com/c/1354414
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612291}

ios/chrome/browser/ui/reading_list/BUILD.gn

@@ -20,8 +20,6 @@ source_set("reading_list") {
     "reading_list_menu_notification_delegate.h",
     "reading_list_menu_notifier.h",
     "reading_list_menu_notifier.mm",
-    "reading_list_side_swipe_provider.h",
-    "reading_list_side_swipe_provider.mm",
     "reading_list_table_view_item.h",
     "reading_list_table_view_item.mm",
     "reading_list_utils.h",
@@ -97,7 +95,6 @@ source_set("reading_list_ui") {
   deps = [
     "resources:reading_list_empty_state",
     "resources:reading_list_empty_state_new",
-    "resources:reading_list_side_swipe",
     "resources:reading_list_tools_icon",
     "//base",
     "//base:i18n",

ios/chrome/browser/ui/reading_list/reading_list_side_swipe_provider.h

-// 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_READING_LIST_READING_LIST_SIDE_SWIPE_PROVIDER_H_
-#define IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_SIDE_SWIPE_PROVIDER_H_
-
-#import "ios/chrome/browser/ui/side_swipe/side_swipe_controller.h"
-
-class ReadingListModel;
-
-@interface ReadingListSideSwipeProvider : NSObject<SideSwipeContentProvider>
-- (instancetype)initWithReadingList:(ReadingListModel*)readingListModel;
-@end
-
-#endif  // IOS_CHROME_BROWSER_UI_READING_LIST_READING_LIST_SIDE_SWIPE_PROVIDER_H_

ios/chrome/browser/ui/reading_list/reading_list_side_swipe_provider.mm

-// 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/reading_list/reading_list_side_swipe_provider.h"
-
-#include "base/logging.h"
-#include "base/metrics/user_metrics.h"
-#include "base/metrics/user_metrics_action.h"
-#include "components/reading_list/core/reading_list_entry.h"
-#include "components/reading_list/core/reading_list_model.h"
-#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#import "ios/chrome/browser/metrics/new_tab_page_uma.h"
-#include "ios/web/public/web_state/web_state.h"
-#include "net/base/network_change_notifier.h"
-#include "url/gurl.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-class ReadingListObserverBridge;
-
-@interface ReadingListSideSwipeProvider () {
-  // Keep a reference to detach before deallocing.
-  ReadingListModel* _readingListModel;  // weak
-}
-
-@end
-
-@implementation ReadingListSideSwipeProvider
-- (instancetype)initWithReadingList:(ReadingListModel*)readingListModel {
-  if (self = [super init]) {
-    _readingListModel = readingListModel;
-  }
-  return self;
-}
-
-- (BOOL)canGoBack {
-  return NO;
-}
-
-- (void)goBack:(web::WebState*)webState {
-  NOTREACHED();
-}
-
-- (BOOL)canGoForward {
-  return _readingListModel->unread_size() > 0;
-}
-
-- (UIImage*)paneIcon {
-  return [UIImage imageNamed:@"reading_list_side_swipe"];
-}
-
-- (BOOL)rotateForwardIcon {
-  return NO;
-}
-
-- (void)goForward:(web::WebState*)webState {
-  if (!webState || _readingListModel->unread_size() == 0) {
-    return;
-  }
-  const ReadingListEntry* firstEntry = _readingListModel->GetFirstUnreadEntry(
-      net::NetworkChangeNotifier::IsOffline());
-  DCHECK(firstEntry);
-  base::RecordAction(base::UserMetricsAction("MobileReadingListOpen"));
-  new_tab_page_uma::RecordAction(
-      ios::ChromeBrowserState::FromBrowserState(webState->GetBrowserState()),
-      new_tab_page_uma::ACTION_OPENED_READING_LIST_ENTRY);
-
-  web::NavigationManager::WebLoadParams params(firstEntry->URL());
-  params.transition_type = ui::PageTransition::PAGE_TRANSITION_AUTO_BOOKMARK;
-  webState->GetNavigationManager()->LoadURLWithParams(params);
-}
-
-@end

ios/chrome/browser/ui/reading_list/resources/BUILD.gn

@@ -31,15 +31,6 @@ imageset("reading_list_empty_state_new") {
   ]
 }
 
-imageset("reading_list_side_swipe") {
-  sources = [
-    "reading_list_side_swipe.imageset/Contents.json",
-    "reading_list_side_swipe.imageset/reading_list_side_swipe.png",
-    "reading_list_side_swipe.imageset/reading_list_side_swipe@2x.png",
-    "reading_list_side_swipe.imageset/reading_list_side_swipe@3x.png",
-  ]
-}
-
 imageset("reading_list_tools_icon") {
   sources = [
     "reading_list_tools_icon.imageset/Contents.json",

ios/chrome/browser/ui/reading_list/resources/reading_list_side_swipe.imageset/Contents.json

-{
-    "images": [
-        {
-            "idiom": "universal",
-            "scale": "1x",
-            "filename": "reading_list_side_swipe.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "2x",
-            "filename": "reading_list_side_swipe@2x.png"
-        },
-        {
-            "idiom": "universal",
-            "scale": "3x",
-            "filename": "reading_list_side_swipe@3x.png"
-        }
-    ],
-    "info": {
-        "version": 1,
-        "author": "xcode"
-    }
-}

ios/chrome/browser/ui/side_swipe/BUILD.gn

@@ -7,8 +7,6 @@ source_set("side_swipe") {
   sources = [
     "card_side_swipe_view.h",
     "card_side_swipe_view.mm",
-    "history_side_swipe_provider.h",
-    "history_side_swipe_provider.mm",
     "side_swipe_controller.h",
     "side_swipe_controller.mm",
     "side_swipe_navigation_view.h",

ios/chrome/browser/ui/side_swipe/history_side_swipe_provider.h

-// 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_SIDE_SWIPE_HISTORY_SIDE_SWIPE_PROVIDER_H_
-#define IOS_CHROME_BROWSER_UI_SIDE_SWIPE_HISTORY_SIDE_SWIPE_PROVIDER_H_
-
-#import "ios/chrome/browser/ui/side_swipe/side_swipe_controller.h"
-
-@class TabModel;
-
-@interface HistorySideSwipeProvider : NSObject<SideSwipeContentProvider>
-- (instancetype)initWithTabModel:(TabModel*)tabModel;
-@end
-
-#endif  // IOS_CHROME_BROWSER_UI_SIDE_SWIPE_HISTORY_SIDE_SWIPE_PROVIDER_H_

ios/chrome/browser/ui/side_swipe/history_side_swipe_provider.mm

-// 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/side_swipe/history_side_swipe_provider.h"
-
-#include "ios/chrome/browser/tabs/tab.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-@interface HistorySideSwipeProvider () {
-  // Keep a reference to detach before deallocing.
-  __weak TabModel* _tabModel;  // weak
-}
-
-@end
-
-@implementation HistorySideSwipeProvider
-- (instancetype)initWithTabModel:(TabModel*)tabModel {
-  self = [super init];
-  if (self) {
-    _tabModel = tabModel;
-  }
-  return self;
-}
-
-- (BOOL)canGoBack {
-  return [[_tabModel currentTab] canGoBack];
-}
-
-- (BOOL)canGoForward {
-  return [[_tabModel currentTab] canGoForward];
-}
-
-- (void)goForward:(web::WebState*)webState {
-  [[_tabModel currentTab] goForward];
-}
-
-- (void)goBack:(web::WebState*)webState {
-  [[_tabModel currentTab] goBack];
-}
-
-- (UIImage*)paneIcon {
-  return [UIImage imageNamed:@"side_swipe_navigation_back"];
-}
-
-- (BOOL)rotateForwardIcon {
-  return YES;
-}
-
-@end

ios/chrome/browser/ui/side_swipe/side_swipe_controller.h

@@ -22,24 +22,6 @@ extern NSString* const kSideSwipeWillStartNotification;
 // Notification sent when the user finishes a side swipe (on tablet).
 extern NSString* const kSideSwipeDidStopNotification;
 
-// A protocol for the Side Swipe controller sources.
-@protocol SideSwipeContentProvider
-// Returns whether this source can provide content for a back/forward side swipe
-// gesture.
-- (BOOL)canGoBack;
-- (BOOL)canGoForward;
-
-// Called on completion of a back/forward gesture.
-- (void)goBack:(web::WebState*)webState;
-- (void)goForward:(web::WebState*)webState;
-
-// The icon to display in the side panel.
-- (UIImage*)paneIcon;
-
-// Whether the icon is oriented and should be reflected on forward pane.
-- (BOOL)rotateForwardIcon;
-@end
-
 @protocol SideSwipeControllerDelegate
 @required
 // Called when the horizontal stack view is done and should be removed.

ios/chrome/browser/ui/side_swipe/side_swipe_controller.mm

@@ -9,9 +9,7 @@
 #include "base/feature_list.h"
 #import "base/ios/block_types.h"
 #include "base/scoped_observer.h"
-#include "components/reading_list/core/reading_list_model.h"
 #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
-#import "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #import "ios/chrome/browser/snapshots/snapshot_cache.h"
 #import "ios/chrome/browser/snapshots/snapshot_cache_factory.h"
 #import "ios/chrome/browser/snapshots/snapshot_tab_helper.h"
@@ -20,9 +18,7 @@
 #import "ios/chrome/browser/ui/fullscreen/animated_scoped_fullscreen_disabler.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_controller_factory.h"
 #import "ios/chrome/browser/ui/fullscreen/scoped_fullscreen_disabler.h"
-#import "ios/chrome/browser/ui/reading_list/reading_list_side_swipe_provider.h"
 #import "ios/chrome/browser/ui/side_swipe/card_side_swipe_view.h"
-#import "ios/chrome/browser/ui/side_swipe/history_side_swipe_provider.h"
 #import "ios/chrome/browser/ui/side_swipe/side_swipe_navigation_view.h"
 #import "ios/chrome/browser/ui/side_swipe/side_swipe_util.h"
 #import "ios/chrome/browser/ui/side_swipe_gesture_recognizer.h"
@@ -95,14 +91,6 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
   // Curtain over web view while waiting for it to load.
   UIView* curtain_;
 
-  // Provides forward/back action for history entries.
-  HistorySideSwipeProvider* historySideSwipeProvider_;
-
-  // Provides forward action for reading list.
-  ReadingListSideSwipeProvider* readingListSideSwipeProvider_;
-
-  __weak id<SideSwipeContentProvider> currentContentProvider_;
-
   // The disabler that prevents the toolbar from being scrolled away when the
   // side swipe gesture is being recognized.
   std::unique_ptr<ScopedFullscreenDisabler> fullscreenDisabler_;
@@ -156,13 +144,6 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
   if (self) {
     model_ = model;
     [model_ addObserver:self];
-    historySideSwipeProvider_ =
-        [[HistorySideSwipeProvider alloc] initWithTabModel:model_];
-
-    readingListSideSwipeProvider_ = [[ReadingListSideSwipeProvider alloc]
-        initWithReadingList:ReadingListModelFactory::GetForBrowserState(
-                                browserState)];
-
     webStateObserverBridge_ =
         std::make_unique<web::WebStateObserverBridge>(self);
     scopedWebStateObserver_ =
@@ -424,20 +405,14 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
   }
 }
 
-- (id<SideSwipeContentProvider>)contentProviderForGesture:(BOOL)goBack {
-  if (goBack && [historySideSwipeProvider_ canGoBack]) {
-    return historySideSwipeProvider_;
-  }
-  if (!goBack && [historySideSwipeProvider_ canGoForward]) {
-    return historySideSwipeProvider_;
-  }
-  if (goBack && [readingListSideSwipeProvider_ canGoBack]) {
-    return readingListSideSwipeProvider_;
+- (BOOL)canNavigate:(BOOL)goBack {
+  if (goBack && [[model_ currentTab] canGoBack]) {
+    return YES;
   }
-  if (!goBack && [readingListSideSwipeProvider_ canGoForward]) {
-    return readingListSideSwipeProvider_;
+  if (!goBack && [[model_ currentTab] canGoForward]) {
+    return YES;
   }
-  return nil;
+  return NO;
 }
 
 // Show swipe to navigate.
@@ -454,9 +429,6 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
     [swipeDelegate_ updateAccessoryViewsForSideSwipeWithVisibility:NO];
     BOOL goBack = IsSwipingBack(gesture.direction);
 
-    currentContentProvider_ = [self contentProviderForGesture:goBack];
-    BOOL canNavigate = currentContentProvider_ != nil;
-
     CGRect gestureBounds = gesture.view.bounds;
     CGFloat headerHeight = [swipeDelegate_ headerHeightForSideSwipe];
     CGRect navigationFrame =
@@ -468,9 +440,8 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
     pageSideSwipeView_ = [[SideSwipeNavigationView alloc]
         initWithFrame:navigationFrame
         withDirection:gesture.direction
-          canNavigate:canNavigate
-                image:[currentContentProvider_ paneIcon]
-        rotateForward:[currentContentProvider_ rotateForwardIcon]];
+          canNavigate:[self canNavigate:goBack]
+                image:[UIImage imageNamed:@"side_swipe_navigation_back"]];
     [pageSideSwipeView_ setTargetView:[swipeDelegate_ sideSwipeContentView]];
 
     [gesture.view insertSubview:pageSideSwipeView_
@@ -489,9 +460,9 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
         BOOL wantsBack = IsSwipingBack(gesture.direction);
         web::WebState* webState = [weakCurrentTab webState];
         if (wantsBack) {
-          [currentContentProvider_ goBack:webState];
+          [[model_ currentTab] goBack];
         } else {
-          [currentContentProvider_ goForward:webState];
+          [[model_ currentTab] goForward];
         }
 
         // Checking -IsLoading() is likely incorrect, but to narrow the scope of

ios/chrome/browser/ui/side_swipe/side_swipe_navigation_view.h

@@ -19,8 +19,7 @@
 - (instancetype)initWithFrame:(CGRect)frame
                 withDirection:(UISwipeGestureRecognizerDirection)direction
                   canNavigate:(BOOL)canNavigate
-                        image:(UIImage*)image
-                rotateForward:(BOOL)rotateForward;
+                        image:(UIImage*)image;
 
 // Update views for latest gesture, and call completion blocks whether
 // |threshold| is met.

ios/chrome/browser/ui/side_swipe/side_swipe_navigation_view.mm

@@ -81,10 +81,6 @@ const CGFloat kSelectionAnimationDuration = 0.5;
   // If |NO| this is an edge gesture and navigation isn't possible. Don't show
   // arrows and bubbles and don't allow navigate.
   BOOL canNavigate_;
-
-  // If |YES| arrowView_ is directionnal and must be rotated 180 degreed for the
-  // forward panes.
-  BOOL rotateForward_;
 }
 // Returns a newly allocated and configured selection circle shape.
 - (CAShapeLayer*)newSelectionCircleLayer;
@@ -100,14 +96,12 @@ const CGFloat kSelectionAnimationDuration = 0.5;
 - (instancetype)initWithFrame:(CGRect)frame
                 withDirection:(UISwipeGestureRecognizerDirection)direction
                   canNavigate:(BOOL)canNavigate
-                        image:(UIImage*)image
-                rotateForward:(BOOL)rotateForward {
+                        image:(UIImage*)image {
   self = [super initWithFrame:frame];
   if (self) {
     self.backgroundColor = [UIColor colorWithWhite:90.0 / 256 alpha:1.0];
 
     canNavigate_ = canNavigate;
-    rotateForward_ = rotateForward;
     if (canNavigate) {
       image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
       const CGRect imageSize = CGRectMake(0, 0, 24, 24);
@@ -188,13 +182,8 @@ const CGFloat kSelectionAnimationDuration = 0.5;
   CGFloat rotationStart = -CGFloat(base::kPiDouble) / 2;
   CGFloat rotationEnd = 0;
   if (gesture.direction == UISwipeGestureRecognizerDirectionLeft) {
-    if (rotateForward_) {
-      rotationStart = CGFloat(base::kPiDouble) * 1.5;
-      rotationEnd = CGFloat(base::kPiDouble);
-    } else {
-      rotationStart = CGFloat(base::kPiDouble) / 2;
-      rotationEnd = 0;
-    }
+    rotationStart = CGFloat(base::kPiDouble) * 1.5;
+    rotationEnd = CGFloat(base::kPiDouble);
   }
   CGAffineTransform rotation = CGAffineTransformMakeRotation(MapValueToRange(
       {0, kArrowThreshold}, {rotationStart, rotationEnd}, distance));