Revert "[ios] Remove forward swipe for reading list."

This reverts commit b74b9644.

Reason for revert: ios_chrome_web_egtests failing

https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/ios-slimnav/465

../../ios/chrome/browser/web/tab_order_egtest.mm:74: error: -[TabOrderTestCase testChildTabOrdering] : Exception: ActionFailedException

Exception Name: ActionFailedException
Exception Reason: An action failed. Please refer to the error trace below.
Exception with Action: {
  "Action Name":  "Locate element bounds",
  "Element Matcher":  "web view in web state"
}

Exception Details: Error Trace: [
  {
    "Description":  "Couldn't locate a bounding rect for element with ID normal-link; either it isn't there or it has no area.",
    "Error Domain":  "com.google.earlgrey.ElementInteractionErrorDomain",
    "Error Code":  "2"
  }
]

Bundle ID: org.chromium.gtest.generic-unit-test

Original change's description:
> [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}

TBR=justincohen@chromium.org,olivierrobin@chromium.org

Change-Id: I3b9b6b9b2a61eaaa11924b5b3e189034831c59d0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 909724
Reviewed-on: https://chromium-review.googlesource.com/c/1356176Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Commit-Queue: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612568}

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

@@ -20,6 +20,8 @@ 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",
@@ -95,6 +97,7 @@ 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,6 +31,15 @@ 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,6 +7,8 @@ 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,6 +22,24 @@ 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,7 +9,9 @@
 #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"
@@ -18,7 +20,9 @@
 #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"
@@ -91,6 +95,14 @@ 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_;
@@ -144,6 +156,13 @@ 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_ =
@@ -405,14 +424,20 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
   }
 }
 
-- (BOOL)canNavigate:(BOOL)goBack {
-  if (goBack && [[model_ currentTab] canGoBack]) {
-    return YES;
+- (id<SideSwipeContentProvider>)contentProviderForGesture:(BOOL)goBack {
+  if (goBack && [historySideSwipeProvider_ canGoBack]) {
+    return historySideSwipeProvider_;
   }
-  if (!goBack && [[model_ currentTab] canGoForward]) {
-    return YES;
+  if (!goBack && [historySideSwipeProvider_ canGoForward]) {
+    return historySideSwipeProvider_;
   }
-  return NO;
+  if (goBack && [readingListSideSwipeProvider_ canGoBack]) {
+    return readingListSideSwipeProvider_;
+  }
+  if (!goBack && [readingListSideSwipeProvider_ canGoForward]) {
+    return readingListSideSwipeProvider_;
+  }
+  return nil;
 }
 
 // Show swipe to navigate.
@@ -429,6 +454,9 @@ 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 =
@@ -440,8 +468,9 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
     pageSideSwipeView_ = [[SideSwipeNavigationView alloc]
         initWithFrame:navigationFrame
         withDirection:gesture.direction
-          canNavigate:[self canNavigate:goBack]
-                image:[UIImage imageNamed:@"side_swipe_navigation_back"]];
+          canNavigate:canNavigate
+                image:[currentContentProvider_ paneIcon]
+        rotateForward:[currentContentProvider_ rotateForwardIcon]];
     [pageSideSwipeView_ setTargetView:[swipeDelegate_ sideSwipeContentView]];
 
     [gesture.view insertSubview:pageSideSwipeView_
@@ -460,9 +489,9 @@ const NSUInteger kIpadGreySwipeTabCount = 8;
         BOOL wantsBack = IsSwipingBack(gesture.direction);
         web::WebState* webState = [weakCurrentTab webState];
         if (wantsBack) {
-          [[model_ currentTab] goBack];
+          [currentContentProvider_ goBack:webState];
         } else {
-          [[model_ currentTab] goForward];
+          [currentContentProvider_ goForward:webState];
         }
 
         // Checking -IsLoading() is likely incorrect, but to narrow the scope of

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

@@ -19,7 +19,8 @@
 - (instancetype)initWithFrame:(CGRect)frame
                 withDirection:(UISwipeGestureRecognizerDirection)direction
                   canNavigate:(BOOL)canNavigate
-                        image:(UIImage*)image;
+                        image:(UIImage*)image
+                rotateForward:(BOOL)rotateForward;
 
 // 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,6 +81,10 @@ 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;
@@ -96,12 +100,14 @@ const CGFloat kSelectionAnimationDuration = 0.5;
 - (instancetype)initWithFrame:(CGRect)frame
                 withDirection:(UISwipeGestureRecognizerDirection)direction
                   canNavigate:(BOOL)canNavigate
-                        image:(UIImage*)image {
+                        image:(UIImage*)image
+                rotateForward:(BOOL)rotateForward {
   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);
@@ -182,8 +188,13 @@ const CGFloat kSelectionAnimationDuration = 0.5;
   CGFloat rotationStart = -CGFloat(base::kPiDouble) / 2;
   CGFloat rotationEnd = 0;
   if (gesture.direction == UISwipeGestureRecognizerDirectionLeft) {
-    rotationStart = CGFloat(base::kPiDouble) * 1.5;
-    rotationEnd = CGFloat(base::kPiDouble);
+    if (rotateForward_) {
+      rotationStart = CGFloat(base::kPiDouble) * 1.5;
+      rotationEnd = CGFloat(base::kPiDouble);
+    } else {
+      rotationStart = CGFloat(base::kPiDouble) / 2;
+      rotationEnd = 0;
+    }
   }
   CGAffineTransform rotation = CGAffineTransformMakeRotation(MapValueToRange(
       {0, kArrowThreshold}, {rotationStart, rotationEnd}, distance));