[iOS] New PageInfo design setup

This CL sets up the new design of the security page info, creating the
flag and the files needed.

- The existing PageInfoVC is renamed LegacyPageInfoViewController
- A new PageInfoViewController is created
- A new PageInfoCoordinator is created
- A features file is created (with the feature inside)
- BrowserCoordinator is instantiating the old/new coordinator based
  on the feature
- The call to display PageInfo depends on the feature state

Bug: 1038919
Change-Id: Ia42620e99c0343a7ee8bdc5838145aa9c5ed4f9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1986825
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Auto-Submit: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728592}

ios/chrome/browser/flags/BUILD.gn

@@ -49,6 +49,7 @@ source_set("flags") {
     "//ios/chrome/browser/ui/dialogs:feature_flags",
     "//ios/chrome/browser/ui/fullscreen:feature_flags",
     "//ios/chrome/browser/ui/infobars:feature_flags",
+    "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/settings/autofill:feature_flags",
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",

ios/chrome/browser/flags/about_flags.mm

@@ -60,6 +60,7 @@
 #import "ios/chrome/browser/ui/dialogs/dialog_features.h"
 #import "ios/chrome/browser/ui/fullscreen/fullscreen_features.h"
 #import "ios/chrome/browser/ui/infobars/infobar_feature.h"
+#import "ios/chrome/browser/ui/page_info/features.h"
 #include "ios/chrome/browser/ui/settings/autofill/features.h"
 #import "ios/chrome/browser/ui/table_view/feature_flags.h"
 #import "ios/chrome/browser/ui/toolbar/public/features.h"
@@ -606,7 +607,9 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
     {"reload-sad-tab", flag_descriptions::kReloadSadTabName,
      flag_descriptions::kReloadSadTabDescription, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(web::kReloadSadTab)},
-};
+    {"page-info-refactoring", flag_descriptions::kPageInfoRefactoringName,
+     flag_descriptions::kPageInfoRefactoringDescription, flags_ui::kOsIos,
+     FEATURE_VALUE_TYPE(kPageInfoRefactoring)}};
 
 // Add all switches from experimental flags to |command_line|.
 void AppendSwitchesFromExperimentalSettings(base::CommandLine* command_line) {

ios/chrome/browser/flags/ios_chrome_flag_descriptions.cc

@@ -307,6 +307,10 @@ const char kOmniboxOnDeviceHeadSuggestionsDescription[] =
     "Shows Google head non personalized search suggestions provided by a "
     "compact on device model";
 
+const char kPageInfoRefactoringName[] = "New design of the page info";
+const char kPageInfoRefactoringDescription[] =
+    "Uses the new design for the page security info.";
+
 const char kPasswordLeakDetectionName[] = "Password Leak Detection";
 const char kPasswordLeakDetectionDescription[] =
     "Enables the detection of leaked passwords.";

ios/chrome/browser/flags/ios_chrome_flag_descriptions.h

@@ -264,6 +264,10 @@ extern const char kOmniboxUseDefaultSearchEngineFaviconDescription[];
 extern const char kOmniboxOnDeviceHeadSuggestionsName[];
 extern const char kOmniboxOnDeviceHeadSuggestionsDescription[];
 
+// Title and description for the flag to enable the new design of the page info.
+extern const char kPageInfoRefactoringName[];
+extern const char kPageInfoRefactoringDescription[];
+
 // Title and description for the flag to enable leak detection for entered
 // credentials.
 extern const char kPasswordLeakDetectionName[];

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

@@ -118,6 +118,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/open_in",
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/page_info:coordinator",
+    "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/page_info/requirements",
     "//ios/chrome/browser/ui/passwords",
     "//ios/chrome/browser/ui/payments",

ios/chrome/browser/ui/browser_view/browser_coordinator.mm

@@ -35,6 +35,8 @@
 #import "ios/chrome/browser/ui/download/ar_quick_look_coordinator.h"
 #import "ios/chrome/browser/ui/download/pass_kit_coordinator.h"
 #import "ios/chrome/browser/ui/open_in/open_in_mediator.h"
+#import "ios/chrome/browser/ui/page_info/features.h"
+#import "ios/chrome/browser/ui/page_info/page_info_coordinator.h"
 #import "ios/chrome/browser/ui/page_info/page_info_legacy_coordinator.h"
 #import "ios/chrome/browser/ui/passwords/password_breach_coordinator.h"
 #import "ios/chrome/browser/ui/print/print_controller.h"
@@ -111,7 +113,7 @@
     ManualFillAllPasswordCoordinator* allPasswordCoordinator;
 
 // Coordinator for Page Info UI.
-@property(nonatomic, strong) PageInfoLegacyCoordinator* pageInfoCoordinator;
+@property(nonatomic, strong) ChromeCoordinator* pageInfoCoordinator;
 
 // Coordinator for the PassKit UI presentation.
 @property(nonatomic, strong) PassKitCoordinator* passKitCoordinator;
@@ -311,10 +313,21 @@
                          browser:self.browser];
   [self.translateInfobarCoordinator start];
 
-  self.pageInfoCoordinator = [[PageInfoLegacyCoordinator alloc]
+  if (base::FeatureList::IsEnabled(kPageInfoRefactoring)) {
+    PageInfoCoordinator* pageInfoCoordinator = [[PageInfoCoordinator alloc]
         initWithBaseViewController:self.viewController
                            browser:self.browser];
-  self.pageInfoCoordinator.presentationProvider = self.viewController;
+    pageInfoCoordinator.presentationProvider = self.viewController;
+    self.pageInfoCoordinator = pageInfoCoordinator;
+
+  } else {
+    PageInfoLegacyCoordinator* pageInfoCoordinator =
+        [[PageInfoLegacyCoordinator alloc]
+            initWithBaseViewController:self.viewController
+                               browser:self.browser];
+    pageInfoCoordinator.presentationProvider = self.viewController;
+    self.pageInfoCoordinator = pageInfoCoordinator;
+  }
   [self.pageInfoCoordinator start];
 
   self.passKitCoordinator = [[PassKitCoordinator alloc]

ios/chrome/browser/ui/commands/page_info_commands.h

@@ -11,14 +11,18 @@
 // Commands related to the Page Info UI.
 @protocol PageInfoCommands
 
-// Show the page security info. |originPoint| is the midpoint of the UI element
+// TODO(crbug.com/1038923): Remove this command.
+// Shows the page security info. |originPoint| is the midpoint of the UI element
 // which triggered this command and should be in window coordinates.
-- (void)showPageInfoForOriginPoint:(CGPoint)originPoint;
+- (void)legacyShowPageInfoForOriginPoint:(CGPoint)originPoint;
 
-// Hide the page security info.
+// Shows the page security info.
+- (void)showPageInfo;
+
+// Hides the page security info.
 - (void)hidePageInfo;
 
-// Show the security help page.
+// Shows the security help page.
 - (void)showSecurityHelpPage;
 
 @end

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

@@ -5,6 +5,8 @@
 source_set("page_info") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "legacy_page_info_view_controller.h",
+    "legacy_page_info_view_controller.mm",
     "page_info_model.cc",
     "page_info_model.h",
     "page_info_view_controller.h",
@@ -48,9 +50,22 @@ source_set("constants") {
   ]
 }
 
+source_set("features") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "features.h",
+    "features.mm",
+  ]
+  deps = [
+    "//base",
+  ]
+}
+
 source_set("coordinator") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
+    "page_info_coordinator.h",
+    "page_info_coordinator.mm",
     "page_info_legacy_coordinator.h",
     "page_info_legacy_coordinator.mm",
   ]

ios/chrome/browser/ui/page_info/features.h

+// Copyright 2020 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_PAGE_INFO_FEATURES_H_
+#define IOS_CHROME_BROWSER_UI_PAGE_INFO_FEATURES_H_
+
+#include "base/feature_list.h"
+
+// Feature to enable the new design of the page info.
+extern const base::Feature kPageInfoRefactoring;
+
+#endif  // IOS_CHROME_BROWSER_UI_PAGE_INFO_FEATURES_H_

ios/chrome/browser/ui/page_info/features.mm

+// Copyright 2020 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/page_info/features.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+const base::Feature kPageInfoRefactoring{"PageInfoRefactoring",
+                                         base::FEATURE_DISABLED_BY_DEFAULT};

ios/chrome/browser/ui/page_info/legacy_page_info_view_controller.h

+// Copyright (c) 2012 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_PAGE_INFO_LEGACY_PAGE_INFO_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_UI_PAGE_INFO_LEGACY_PAGE_INFO_VIEW_CONTROLLER_H_
+
+#import <UIKit/UIKit.h>
+
+#include <memory>
+
+#include "base/memory/weak_ptr.h"
+
+@protocol PageInfoCommands;
+@protocol PageInfoPresentation;
+@protocol PageInfoReloading;
+class PageInfoModel;
+
+// TODO(crbug.com/227827) Merge 178763: PageInfoModel has been removed in
+// upstream; check if we should use PageInfoModel.
+// The view controller for the page info view.
+@interface LegacyPageInfoViewController : NSObject
+// Designated initializer.
+// The |sourcePoint| parameter should be in the coordinate system of
+// |provider|'s view. Typically, |sourcePoint| would be the midpoint of a button
+// that resulted in this popup being displayed.
+- (id)initWithModel:(PageInfoModel*)model
+             sourcePoint:(CGPoint)sourcePoint
+    presentationProvider:(id<PageInfoPresentation>)provider
+              dispatcher:(id<PageInfoCommands, PageInfoReloading>)dispatcher;
+
+// Dispatcher for this view controller.
+@property(nonatomic, weak) id<PageInfoCommands, PageInfoReloading> dispatcher;
+
+// Dismisses the view.
+- (void)dismiss;
+
+// Layout the page info view.
+- (void)performLayout;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_PAGE_INFO_LEGACY_PAGE_INFO_VIEW_CONTROLLER_H_

ios/chrome/browser/ui/page_info/legacy_page_info_view_controller.mm

+// Copyright (c) 2012 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/page_info/legacy_page_info_view_controller.h"
+
+#include "base/bind.h"
+#include "base/location.h"
+#include "base/mac/bundle_locations.h"
+#import "base/mac/foundation_util.h"
+#include "base/single_thread_task_runner.h"
+#include "base/strings/sys_string_conversions.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "components/strings/grit/components_strings.h"
+#import "ios/chrome/browser/ui/commands/page_info_commands.h"
+#import "ios/chrome/browser/ui/fancy_ui/bidi_container_view.h"
+#import "ios/chrome/browser/ui/page_info/page_info_constants.h"
+#include "ios/chrome/browser/ui/page_info/page_info_model.h"
+#import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h"
+#import "ios/chrome/browser/ui/page_info/requirements/page_info_reloading.h"
+#import "ios/chrome/browser/ui/util/animation_util.h"
+#include "ios/chrome/browser/ui/util/rtl_geometry.h"
+#include "ios/chrome/browser/ui/util/ui_util.h"
+#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
+#import "ios/chrome/common/colors/UIColor+cr_semantic_colors.h"
+#import "ios/chrome/common/colors/semantic_color_names.h"
+#import "ios/chrome/common/material_timing.h"
+#include "ios/chrome/grit/ios_strings.h"
+#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/l10n/l10n_util_mac.h"
+#import "ui/gfx/ios/NSString+CrStringDrawing.h"
+#import "ui/gfx/ios/uikit_util.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+using ios::material::TimingFunction;
+
+namespace {
+
+// The width of the view.
+const CGFloat kViewWidthRegular = 600.0;
+const CGFloat kViewWidthCompact = 288.0;
+const CGFloat kViewWidthiPhoneLandscape = 400.0;
+// Spacing in between sections.
+const CGFloat kVerticalSpacing = 20.0;
+// Initial position for the left side of the frame.
+const CGFloat kInitialFramePosition = 8.0;
+// Alpha for the shield.
+const CGFloat kShieldAlpha = 0.5;
+// Scroll View inset.
+const CGFloat kScrollViewInset = 5.0;
+// The size of the footer (rounded corner and shadow) for page info view.
+const CGFloat kPageInfoViewFooterSize = 15.0;
+// Padding between the window frame and content.
+const CGFloat kFramePadding = 24;
+// Padding for the initial line of the view.
+const CGFloat kInitialLinePadding = 40;
+// Padding between the bottom of the content and the window frame.
+const CGFloat kFrameBottomPadding = 16;
+// Spacing between the optional headline and description text views.
+const CGFloat kHeadlineSpacing = 16;
+// Spacing between the image and the text.
+const CGFloat kImageSpacing = 16;
+// Square size of the image.
+const CGFloat kImageSize = 24;
+// The height of the headline label.
+const CGFloat kHeadlineHeight = 19;
+
+inline UIFont* PageInfoHeadlineFont() {
+  return [[MDCTypography fontLoader] mediumFontOfSize:16];
+}
+
+inline CATransform3D PageInfoAnimationScale() {
+  return CATransform3DMakeScale(0.03, 0.03, 1);
+}
+
+// Offset to make sure image aligns with the header line.
+inline CGFloat PageInfoImageVerticalOffset() {
+  return ui::AlignValueToUpperPixel((kHeadlineHeight - kImageSize) / 2.0);
+}
+
+// The X position of the text fields. Variants for with and without an image.
+const CGFloat kTextXPositionNoImage = kFramePadding;
+const CGFloat kTextXPosition =
+    kTextXPositionNoImage + kImageSize + kImageSpacing;
+
+// The X offset for the help button.
+const CGFloat kButtonXOffset = kTextXPosition;
+
+}  // namespace
+
+#pragma mark - LegacyPageInfoViewController
+
+@interface LegacyPageInfoViewController () {
+  // Scroll View inside the PageInfoView used to display content that exceeds
+  // the available space.
+  UIScrollView* _scrollView;
+  // Container View added inside the Scroll View. All content is added to this
+  // view.
+  BidiContainerView* _innerContainerView;
+
+  // Origin of the arrow at the top of the popup window.
+  CGPoint _arrowOriginPoint;
+
+  // Model for the data to display.
+  std::unique_ptr<PageInfoModel> _model;
+
+  // Width of the view. Depends on the device (iPad/iPhone).
+  CGFloat _viewWidth;
+
+  // Width of the text fields.
+  CGFloat _textWidth;
+
+  // YES when the popup has finished animating in. NO otherwise.
+  BOOL _displayAnimationCompleted;
+}
+
+@property(nonatomic, strong) UIView* containerView;
+@property(nonatomic, strong) UIView* popupContainer;
+// An invisible button added to the |containerView|. Closes the popup just like
+// the tap on the background. Exposed purely for voiceover purposes.
+@property(nonatomic, strong) UIButton* closeButton;
+
+@end
+
+@implementation LegacyPageInfoViewController
+
+#pragma mark public
+
+- (id)initWithModel:(PageInfoModel*)model
+             sourcePoint:(CGPoint)sourcePoint
+    presentationProvider:(id<PageInfoPresentation>)provider
+              dispatcher:(id<PageInfoCommands, PageInfoReloading>)dispatcher {
+  DCHECK(provider);
+  self = [super init];
+  if (self) {
+    _scrollView =
+        [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, 240, 128)];
+    [_scrollView setMultipleTouchEnabled:YES];
+    [_scrollView setClipsToBounds:YES];
+    [_scrollView setShowsHorizontalScrollIndicator:NO];
+    [_scrollView setIndicatorStyle:UIScrollViewIndicatorStyleBlack];
+    [_scrollView
+        setAutoresizingMask:(UIViewAutoresizingFlexibleTrailingMargin() |
+                             UIViewAutoresizingFlexibleTopMargin)];
+
+    _innerContainerView =
+        [[BidiContainerView alloc] initWithFrame:CGRectMake(0, 0, 194, 327)];
+    [_innerContainerView
+        setAccessibilityLabel:@"Page Security Info Scroll Container"];
+    [_innerContainerView
+        setAutoresizingMask:(UIViewAutoresizingFlexibleTrailingMargin() |
+                             UIViewAutoresizingFlexibleBottomMargin)];
+
+    _model.reset(model);
+    _arrowOriginPoint = sourcePoint;
+    _dispatcher = dispatcher;
+
+    UIInterfaceOrientation orientation =
+        [[UIApplication sharedApplication] statusBarOrientation];
+    _viewWidth = IsCompactWidth() ? kViewWidthCompact : kViewWidthRegular;
+    // Special case iPhone landscape.
+    if (!IsIPadIdiom() && UIInterfaceOrientationIsLandscape(orientation))
+      _viewWidth = kViewWidthiPhoneLandscape;
+
+    _textWidth = _viewWidth - (kImageSize + kImageSpacing + kFramePadding * 2 +
+                               kScrollViewInset * 2);
+
+    _containerView = [[UIView alloc] init];
+    [_containerView setBackgroundColor:[UIColor colorWithWhite:0
+                                                         alpha:kShieldAlpha]];
+    [_containerView setOpaque:NO];
+    [_containerView setAlpha:0];
+    [_containerView setAccessibilityViewIsModal:YES];
+    _containerView.accessibilityIdentifier =
+        kPageInfoViewAccessibilityIdentifier;
+
+    // Set up an invisible button that closes the popup.
+    _closeButton = [[UIButton alloc] init];
+    _closeButton.accessibilityLabel = l10n_util::GetNSString(IDS_DONE);
+    [_closeButton addTarget:dispatcher
+                     action:@selector(hidePageInfo)
+           forControlEvents:UIControlEventTouchDown];
+    [_containerView addSubview:_closeButton];
+
+    _popupContainer = [[UIView alloc] initWithFrame:CGRectZero];
+    [_popupContainer setBackgroundColor:UIColor.cr_systemBackgroundColor];
+    [_popupContainer setClipsToBounds:YES];
+    _popupContainer.userInteractionEnabled = YES;
+    [_containerView addSubview:_popupContainer];
+
+    [self.popupContainer addSubview:_scrollView];
+    [_scrollView addSubview:_innerContainerView];
+    [_scrollView setAccessibilityIdentifier:@"Page Security Scroll View"];
+    [provider presentPageInfoView:self.containerView];
+    [self performLayout];
+
+    [self animatePageInfoViewIn:sourcePoint];
+    UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification,
+                                    _containerView);
+  }
+
+  return self;
+}
+
+- (void)performLayout {
+  CGFloat offset = kInitialLinePadding;
+
+  // Keep the new subviews in an array that gets replaced at the end.
+  NSMutableArray* subviews = [NSMutableArray array];
+
+  int sectionCount = _model->GetSectionCount();
+  PageInfoModel::ButtonAction action = PageInfoModel::BUTTON_NONE;
+
+  for (int i = 0; i < sectionCount; i++) {
+    PageInfoModel::SectionInfo info = _model->GetSectionInfo(i);
+
+    if (action == PageInfoModel::BUTTON_NONE &&
+        info.button != PageInfoModel::BUTTON_NONE) {
+      // Show the button corresponding to the first section that requires a
+      // button.
+      action = info.button;
+    }
+
+    // Only certain sections have images. This affects the X position.
+    BOOL hasImage = _model->GetIconImage(info.icon_id) != nil;
+    CGFloat xPosition = (hasImage ? kTextXPosition : kTextXPositionNoImage);
+
+    // Insert the image subview for sections that are appropriate.
+    CGFloat imageBaseline = offset + kImageSize;
+    if (hasImage) {
+      [self addImageViewForInfo:info
+                     toSubviews:subviews
+                       atOffset:offset + PageInfoImageVerticalOffset()];
+    }
+
+    // Add the title.
+    if (!info.headline.empty()) {
+      offset += [self addHeadlineViewForInfo:info
+                                  toSubviews:subviews
+                                     atPoint:CGPointMake(xPosition, offset)];
+      offset += kHeadlineSpacing;
+    }
+
+    // Create the description of the state.
+    offset += [self addDescriptionViewForInfo:info
+                                   toSubviews:subviews
+                                      atPoint:CGPointMake(xPosition, offset)];
+
+    // If at this point the description and optional headline and button are
+    // not as tall as the image, adjust the offset by the difference.
+    CGFloat imageBaselineDelta = imageBaseline - offset;
+    if (imageBaselineDelta > 0)
+      offset += imageBaselineDelta;
+
+    // Add the separators.
+    int testSectionCount = sectionCount - 1;
+    if (i != testSectionCount ||
+        (i == testSectionCount && action != PageInfoModel::BUTTON_NONE)) {
+      offset += kVerticalSpacing;
+    }
+  }
+
+  // The last item at the bottom of the window is the help center link. Do not
+  // show this for the internal pages, which have one section.
+  offset += [self addButton:action toSubviews:subviews atOffset:offset];
+
+  // Add the bottom padding.
+  offset += kVerticalSpacing;
+  CGRect frame = CGRectMake(kInitialFramePosition, _arrowOriginPoint.y,
+                            _viewWidth, offset);
+
+  // Increase the size of the frame by the amount used for drawing rounded
+  // corners and shadow.
+  frame.size.height += kPageInfoViewFooterSize;
+
+  if (CGRectGetMaxY(frame) >
+      CGRectGetMaxY([[self containerView] superview].bounds) -
+          kFrameBottomPadding) {
+    // If the frame is bigger than the parent view than change the frame to
+    // fit in the superview bounds.
+    frame.size.height = [[self containerView] superview].bounds.size.height -
+                        kFrameBottomPadding - frame.origin.y;
+
+    [_scrollView setScrollEnabled:YES];
+    [_scrollView flashScrollIndicators];
+  } else {
+    [_scrollView setScrollEnabled:NO];
+  }
+
+  CGRect containerBounds = [_containerView bounds];
+  CGRect popupFrame = frame;
+  popupFrame.origin.x =
+      CGRectGetMidX(containerBounds) - CGRectGetWidth(popupFrame) / 2.0;
+  popupFrame.origin.y =
+      CGRectGetMidY(containerBounds) - CGRectGetHeight(popupFrame) / 2.0;
+
+  popupFrame.origin = AlignPointToPixel(popupFrame.origin);
+  CGRect innerFrame = CGRectMake(0, 0, popupFrame.size.width, offset);
+
+  // If the initial animation has completed, animate the new frames.
+  if (_displayAnimationCompleted) {
+    [UIView cr_animateWithDuration:ios::material::kDuration3
+                             delay:0
+                             curve:ios::material::CurveEaseInOut
+                           options:0
+                        animations:^{
+                          [_popupContainer setFrame:popupFrame];
+                          [_scrollView setFrame:[_popupContainer bounds]];
+                          [_innerContainerView setFrame:innerFrame];
+                        }
+                        completion:nil];
+  } else {
+    // Popup hasn't finished animating in yet. Set frames immediately.
+    [_popupContainer setFrame:popupFrame];
+    [_scrollView setFrame:[_popupContainer bounds]];
+    [_innerContainerView setFrame:innerFrame];
+  }
+
+  for (UIView* view in [_innerContainerView subviews]) {
+    [view removeFromSuperview];
+  }
+
+  for (UIView* view in subviews) {
+    [_innerContainerView addSubview:view];
+    [_innerContainerView setSubviewNeedsAdjustmentForRTL:view];
+  }
+
+  [_scrollView setContentSize:_innerContainerView.frame.size];
+  _closeButton.frame = _containerView.bounds;
+}
+
+- (void)dismiss {
+  [self animatePageInfoViewOut];
+  UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification,
+                                  nil);
+}
+
+#pragma mark - internal
+
+- (BOOL)accessibilityPerformEscape {
+  [self.dispatcher hidePageInfo];
+  return YES;
+}
+
+- (void)animatePageInfoViewIn:(CGPoint)sourcePoint {
+  // Animate the info card itself.
+  CATransform3D scaleTransform = PageInfoAnimationScale();
+
+  CABasicAnimation* scaleAnimation =
+      [CABasicAnimation animationWithKeyPath:@"transform"];
+  [scaleAnimation setFromValue:[NSValue valueWithCATransform3D:scaleTransform]];
+
+  CABasicAnimation* positionAnimation =
+      [CABasicAnimation animationWithKeyPath:@"position"];
+  [positionAnimation setFromValue:[NSValue valueWithCGPoint:sourcePoint]];
+
+  CAAnimationGroup* sizeAnimation = [CAAnimationGroup animation];
+  [sizeAnimation setAnimations:@[ scaleAnimation, positionAnimation ]];
+  [sizeAnimation
+      setTimingFunction:TimingFunction(ios::material::CurveEaseInOut)];
+  [sizeAnimation setDuration:ios::material::kDuration3];
+
+  CABasicAnimation* fadeAnimation =
+      [CABasicAnimation animationWithKeyPath:@"opacity"];
+  [fadeAnimation setTimingFunction:TimingFunction(ios::material::CurveEaseOut)];
+  [fadeAnimation setDuration:ios::material::kDuration6];
+  [fadeAnimation setFromValue:@0];
+  [fadeAnimation setToValue:@1];
+
+  [[_popupContainer layer] addAnimation:fadeAnimation forKey:@"fade"];
+  [[_popupContainer layer] addAnimation:sizeAnimation forKey:@"size"];
+
+  // Animation the background grey overlay.
+  CABasicAnimation* overlayAnimation =
+      [CABasicAnimation animationWithKeyPath:@"opacity"];
+  [overlayAnimation
+      setTimingFunction:TimingFunction(ios::material::CurveEaseOut)];
+  [overlayAnimation setDuration:ios::material::kDuration3];
+  [overlayAnimation setFromValue:@0];
+  [overlayAnimation setToValue:@1];
+
+  [[_containerView layer] addAnimation:overlayAnimation forKey:@"fade"];
+  [_containerView setAlpha:1];
+
+  // Animate the contents of the info card.
+  CALayer* contentsLayer = [_innerContainerView layer];
+
+  CGRect startFrame = CGRectOffset([_innerContainerView frame], 0, -32);
+  CAAnimation* contentSlideAnimation = FrameAnimationMake(
+      contentsLayer, startFrame, [_innerContainerView frame]);
+  [contentSlideAnimation
+      setTimingFunction:TimingFunction(ios::material::CurveEaseOut)];
+  [contentSlideAnimation setDuration:ios::material::kDuration5];
+  contentSlideAnimation =
+      DelayedAnimationMake(contentSlideAnimation, ios::material::kDuration2);
+  [contentsLayer addAnimation:contentSlideAnimation forKey:@"slide"];
+
+  [CATransaction begin];
+  [CATransaction setCompletionBlock:^{
+    [_innerContainerView setAlpha:1];
+    _displayAnimationCompleted = YES;
+  }];
+  CAAnimation* contentFadeAnimation = OpacityAnimationMake(0.0, 1.0);
+  [contentFadeAnimation
+      setTimingFunction:TimingFunction(ios::material::CurveEaseOut)];
+  [contentFadeAnimation setDuration:ios::material::kDuration5];
+  contentFadeAnimation =
+      DelayedAnimationMake(contentFadeAnimation, ios::material::kDuration1);
+  [contentsLayer addAnimation:contentFadeAnimation forKey:@"fade"];
+  [CATransaction commit];
+
+  // Since the animations have delay on them, the alpha of the content view
+  // needs to be set to zero and then one after the animation starts. If these
+  // steps are not taken, there will be a visible flash/jump from the initial
+  // spot during the animation.
+  [_innerContainerView setAlpha:0];
+}
+
+- (void)animatePageInfoViewOut {
+  [CATransaction begin];
+  [CATransaction setCompletionBlock:^{
+    [self.containerView removeFromSuperview];
+  }];
+
+  CABasicAnimation* opacityAnimation =
+      [CABasicAnimation animationWithKeyPath:@"opacity"];
+  [opacityAnimation
+      setTimingFunction:TimingFunction(ios::material::CurveEaseIn)];
+  [opacityAnimation setDuration:ios::material::kDuration3];
+  [opacityAnimation setFromValue:@1];
+  [opacityAnimation setToValue:@0];
+  [[_containerView layer] addAnimation:opacityAnimation forKey:@"animateOut"];
+
+  [_popupContainer setAlpha:0];
+  [_containerView setAlpha:0];
+  [CATransaction commit];
+}
+
+#pragma mark - Helper methods to create subviews.
+
+// Adds the state image at a pre-determined x position and the given y. This
+// does not affect the next Y position because the image is placed next to
+// a text field that is larger and accounts for the image's size.
+- (void)addImageViewForInfo:(const PageInfoModel::SectionInfo&)info
+                 toSubviews:(NSMutableArray*)subviews
+                   atOffset:(CGFloat)offset {
+  CGRect frame = CGRectMake(kFramePadding, offset, kImageSize, kImageSize);
+  UIImageView* imageView = [[UIImageView alloc] initWithFrame:frame];
+  imageView.tintColor = UIColor.cr_labelColor;
+  UIImage* image = [_model->GetIconImage(info.icon_id)->ToUIImage()
+      imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+  [imageView setImage:image];
+  [subviews addObject:imageView];
+}
+
+// Adds the title text field at the given x,y position, and returns the y
+// position for the next element.
+- (CGFloat)addHeadlineViewForInfo:(const PageInfoModel::SectionInfo&)info
+                       toSubviews:(NSMutableArray*)subviews
+                          atPoint:(CGPoint)point {
+  CGRect frame = CGRectMake(point.x, point.y, _textWidth, kHeadlineHeight);
+  UILabel* label = [[UILabel alloc] initWithFrame:frame];
+  [label setTextAlignment:NSTextAlignmentNatural];
+  [label setText:base::SysUTF16ToNSString(info.headline)];
+  [label setTextColor:UIColor.cr_labelColor];
+  [label setFont:PageInfoHeadlineFont()];
+  [label setFrame:frame];
+  [label setLineBreakMode:NSLineBreakByTruncatingHead];
+  [subviews addObject:label];
+  return CGRectGetHeight(frame);
+}
+
+// Adds the description text field at the given x,y position, and returns the y
+// position for the next element.
+- (CGFloat)addDescriptionViewForInfo:(const PageInfoModel::SectionInfo&)info
+                          toSubviews:(NSMutableArray*)subviews
+                             atPoint:(CGPoint)point {
+  CGRect frame = CGRectMake(point.x, point.y, _textWidth, kImageSize);
+  UILabel* label = [[UILabel alloc] initWithFrame:frame];
+  [label setTextAlignment:NSTextAlignmentNatural];
+  NSString* description = base::SysUTF16ToNSString(info.description);
+  UIFont* font = [MDCTypography captionFont];
+  [label setTextColor:UIColor.cr_labelColor];
+  [label setText:description];
+  [label setFont:font];
+  [label setNumberOfLines:0];
+
+  // If the text is oversized, resize the text field.
+  CGSize constraintSize = CGSizeMake(_textWidth, CGFLOAT_MAX);
+  CGSize sizeToFit = [description cr_boundingSizeWithSize:constraintSize
+                                                     font:font];
+  frame.size.height = sizeToFit.height;
+  [label setFrame:frame];
+  [subviews addObject:label];
+  return CGRectGetHeight(frame);
+}
+
+// Returns a button with title and action configured for |buttonAction|.
+- (UIButton*)buttonForAction:(PageInfoModel::ButtonAction)buttonAction {
+  if (buttonAction == PageInfoModel::BUTTON_NONE) {
+    return nil;
+  }
+  UIButton* button = [[UIButton alloc] initWithFrame:CGRectZero];
+  int messageId;
+  NSString* accessibilityID = @"Reload button";
+  switch (buttonAction) {
+    case PageInfoModel::BUTTON_NONE:
+      NOTREACHED();
+      return nil;
+    case PageInfoModel::BUTTON_SHOW_SECURITY_HELP:
+      messageId = IDS_LEARN_MORE;
+      accessibilityID = @"Learn more";
+      [button addTarget:self.dispatcher
+                    action:@selector(showSecurityHelpPage)
+          forControlEvents:UIControlEventTouchUpInside];
+      break;
+    case PageInfoModel::BUTTON_RELOAD:
+      messageId = IDS_IOS_PAGE_INFO_RELOAD;
+      accessibilityID = @"Reload button";
+      [button addTarget:self.dispatcher
+                    action:@selector(hidePageInfo)
+          forControlEvents:UIControlEventTouchUpInside];
+      [button addTarget:self.dispatcher
+                    action:@selector(reload)
+          forControlEvents:UIControlEventTouchUpInside];
+      break;
+  };
+
+  NSString* title = l10n_util::GetNSStringWithFixup(messageId);
+  SetA11yLabelAndUiAutomationName(button, messageId, accessibilityID);
+  [button setTitle:title forState:UIControlStateNormal];
+  return button;
+}
+
+// Adds the the button |buttonAction| that explains the icons. Returns the y
+// position delta for the next offset.
+- (CGFloat)addButton:(PageInfoModel::ButtonAction)buttonAction
+          toSubviews:(NSMutableArray*)subviews
+            atOffset:(CGFloat)offset {
+  UIButton* button = [self buttonForAction:buttonAction];
+  if (!button) {
+    return 0;
+  }
+  // The size of the initial frame is irrelevant since it will be changed based
+  // on the size for the string inside.
+  CGRect frame = CGRectMake(kButtonXOffset, offset, 100, 10);
+
+  UIFont* font = [MDCTypography captionFont];
+  CGSize sizeWithFont =
+      [[[button titleLabel] text] cr_pixelAlignedSizeWithFont:font];
+  frame.size = sizeWithFont;
+  // According to iOS Human Interface Guidelines, minimal size of UIButton
+  // should be 44x44.
+  frame.size.height = std::max<CGFloat>(44, frame.size.height);
+
+  [button setFrame:frame];
+
+  [button.titleLabel setFont:font];
+  [button.titleLabel setTextAlignment:NSTextAlignmentLeft];
+  [button setTitleColor:[UIColor colorNamed:kBlueColor]
+               forState:UIControlStateNormal];
+  [button setTitleColor:[UIColor colorNamed:kBlueColor]
+               forState:UIControlStateSelected];
+
+  [subviews addObject:button];
+
+  return CGRectGetHeight([button frame]);
+}
+
+@end

ios/chrome/browser/ui/page_info/page_info_coordinator.h

+// Copyright 2020 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_PAGE_INFO_PAGE_INFO_COORDINATOR_H_
+#define IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_COORDINATOR_H_
+
+#import <Foundation/Foundation.h>
+
+#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+
+@protocol PageInfoPresentation;
+
+// The coordinator for the page info.
+@interface PageInfoCoordinator : ChromeCoordinator
+
+// |presentationProvider| provides information and runs tasks necessary to
+// present Page Info.
+@property(nonatomic, weak) id<PageInfoPresentation> presentationProvider;
+
+@end
+
+#endif  // IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_COORDINATOR_H_

ios/chrome/browser/ui/page_info/page_info_coordinator.mm

+// Copyright 2020 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/page_info/page_info_coordinator.h"
+
+#include "base/logging.h"
+#include "ios/chrome/browser/main/browser.h"
+#import "ios/chrome/browser/ui/commands/command_dispatcher.h"
+#import "ios/chrome/browser/ui/commands/page_info_commands.h"
+#import "ios/chrome/browser/ui/page_info/page_info_view_controller.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+@interface PageInfoCoordinator () <PageInfoCommands>
+
+@end
+
+@implementation PageInfoCoordinator
+
+@synthesize presentationProvider = _presentationProvider;
+
+#pragma mark - ChromeCoordinator
+
+- (void)start {
+  [self.browser->GetCommandDispatcher()
+      startDispatchingToTarget:self
+                   forProtocol:@protocol(PageInfoCommands)];
+}
+
+- (void)stop {
+  [self.browser->GetCommandDispatcher() stopDispatchingToTarget:self];
+}
+
+#pragma mark - PageInfoCommands
+
+- (void)legacyShowPageInfoForOriginPoint:(CGPoint)originPoint {
+  NOTREACHED();
+}
+
+- (void)showPageInfo {
+  // TODO(crbug.com/1038919): Implement this.
+}
+
+- (void)hidePageInfo {
+  // TODO(crbug.com/1038919): Implement this.
+}
+
+- (void)showSecurityHelpPage {
+  // TODO(crbug.com/1038919): Implement this.
+}
+
+@end

ios/chrome/browser/ui/page_info/page_info_legacy_coordinator.mm

@@ -17,9 +17,9 @@
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/ui/commands/page_info_commands.h"
 #import "ios/chrome/browser/ui/fullscreen/chrome_coordinator+fullscreen_disabling.h"
+#import "ios/chrome/browser/ui/page_info/legacy_page_info_view_controller.h"
 #import "ios/chrome/browser/ui/page_info/page_info_constants.h"
 #include "ios/chrome/browser/ui/page_info/page_info_model.h"
-#import "ios/chrome/browser/ui/page_info/page_info_view_controller.h"
 #import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h"
 #import "ios/chrome/browser/ui/page_info/requirements/page_info_reloading.h"
 #import "ios/chrome/browser/url_loading/url_loading_params.h"
@@ -39,12 +39,15 @@
 @interface PageInfoLegacyCoordinator ()<PageInfoCommands, PageInfoReloading>
 
 // The view controller for the Page Info UI. Nil if not visible.
-@property(nonatomic, strong) PageInfoViewController* pageInfoViewController;
+@property(nonatomic, strong)
+    LegacyPageInfoViewController* pageInfoViewController;
 
 @end
 
 @implementation PageInfoLegacyCoordinator
 
+@synthesize presentationProvider = _presentationProvider;
+
 #pragma mark - ChromeCoordinator
 
 - (void)start {
@@ -63,7 +66,7 @@
 
 #pragma mark - PageInfoCommands
 
-- (void)showPageInfoForOriginPoint:(CGPoint)originPoint {
+- (void)legacyShowPageInfoForOriginPoint:(CGPoint)originPoint {
   web::WebState* webState =
       self.browser->GetWebStateList()->GetActiveWebState();
   web::NavigationItem* navItem =
@@ -103,13 +106,17 @@
 
   CGPoint originPresentationCoordinates = [self.presentationProvider
       convertToPresentationCoordinatesForOrigin:originPoint];
-  self.pageInfoViewController = [[PageInfoViewController alloc]
+  self.pageInfoViewController = [[LegacyPageInfoViewController alloc]
              initWithModel:pageInfoModel
                sourcePoint:originPresentationCoordinates
       presentationProvider:self.presentationProvider
                 dispatcher:self];
 }
 
+- (void)showPageInfo {
+  NOTREACHED();
+}
+
 - (void)hidePageInfo {
   // Early return if the PageInfoPopup is not presented.
   if (!self.pageInfoViewController)

ios/chrome/browser/ui/page_info/page_info_view_controller.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2020 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.
 
@@ -7,36 +7,8 @@
 
 #import <UIKit/UIKit.h>
 
-#include <memory>
-
-#include "base/memory/weak_ptr.h"
-
-@protocol PageInfoCommands;
-@protocol PageInfoPresentation;
-@protocol PageInfoReloading;
-class PageInfoModel;
-
-// TODO(crbug.com/227827) Merge 178763: PageInfoModel has been removed in
-// upstream; check if we should use PageInfoModel.
-// The view controller for the page info view.
-@interface PageInfoViewController : NSObject
-// Designated initializer.
-// The |sourcePoint| parameter should be in the coordinate system of
-// |provider|'s view. Typically, |sourcePoint| would be the midpoint of a button
-// that resulted in this popup being displayed.
-- (id)initWithModel:(PageInfoModel*)model
-             sourcePoint:(CGPoint)sourcePoint
-    presentationProvider:(id<PageInfoPresentation>)provider
-              dispatcher:(id<PageInfoCommands, PageInfoReloading>)dispatcher;
-
-// Dispatcher for this view controller.
-@property(nonatomic, weak) id<PageInfoCommands, PageInfoReloading> dispatcher;
-
-// Dismisses the view.
-- (void)dismiss;
-
-// Layout the page info view.
-- (void)performLayout;
+// View Controller for displaying the page info.
+@interface PageInfoViewController : UIViewController
 
 @end
 

ios/chrome/browser/ui/page_info/page_info_view_controller.mm

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2020 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/page_info/page_info_view_controller.h"
 
-#include "base/bind.h"
-#include "base/location.h"
-#include "base/mac/bundle_locations.h"
-#import "base/mac/foundation_util.h"
-#include "base/single_thread_task_runner.h"
-#include "base/strings/sys_string_conversions.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "components/strings/grit/components_strings.h"
-#import "ios/chrome/browser/ui/commands/page_info_commands.h"
-#import "ios/chrome/browser/ui/fancy_ui/bidi_container_view.h"
-#import "ios/chrome/browser/ui/page_info/page_info_constants.h"
-#include "ios/chrome/browser/ui/page_info/page_info_model.h"
-#import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h"
-#import "ios/chrome/browser/ui/page_info/requirements/page_info_reloading.h"
-#import "ios/chrome/browser/ui/util/animation_util.h"
-#include "ios/chrome/browser/ui/util/rtl_geometry.h"
-#include "ios/chrome/browser/ui/util/ui_util.h"
-#import "ios/chrome/browser/ui/util/uikit_ui_util.h"
-#import "ios/chrome/common/colors/UIColor+cr_semantic_colors.h"
-#import "ios/chrome/common/colors/semantic_color_names.h"
-#import "ios/chrome/common/material_timing.h"
-#include "ios/chrome/grit/ios_strings.h"
-#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/l10n_util_mac.h"
-#import "ui/gfx/ios/NSString+CrStringDrawing.h"
-#import "ui/gfx/ios/uikit_util.h"
-
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-using ios::material::TimingFunction;
-
-namespace {
-
-// The width of the view.
-const CGFloat kViewWidthRegular = 600.0;
-const CGFloat kViewWidthCompact = 288.0;
-const CGFloat kViewWidthiPhoneLandscape = 400.0;
-// Spacing in between sections.
-const CGFloat kVerticalSpacing = 20.0;
-// Initial position for the left side of the frame.
-const CGFloat kInitialFramePosition = 8.0;
-// Alpha for the shield.
-const CGFloat kShieldAlpha = 0.5;
-// Scroll View inset.
-const CGFloat kScrollViewInset = 5.0;
-// The size of the footer (rounded corner and shadow) for page info view.
-const CGFloat kPageInfoViewFooterSize = 15.0;
-// Padding between the window frame and content.
-const CGFloat kFramePadding = 24;
-// Padding for the initial line of the view.
-const CGFloat kInitialLinePadding = 40;
-// Padding between the bottom of the content and the window frame.
-const CGFloat kFrameBottomPadding = 16;
-// Spacing between the optional headline and description text views.
-const CGFloat kHeadlineSpacing = 16;
-// Spacing between the image and the text.
-const CGFloat kImageSpacing = 16;
-// Square size of the image.
-const CGFloat kImageSize = 24;
-// The height of the headline label.
-const CGFloat kHeadlineHeight = 19;
-
-inline UIFont* PageInfoHeadlineFont() {
-  return [[MDCTypography fontLoader] mediumFontOfSize:16];
-}
-
-inline CATransform3D PageInfoAnimationScale() {
-  return CATransform3DMakeScale(0.03, 0.03, 1);
-}
-
-// Offset to make sure image aligns with the header line.
-inline CGFloat PageInfoImageVerticalOffset() {
-  return ui::AlignValueToUpperPixel((kHeadlineHeight - kImageSize) / 2.0);
-}
-
-// The X position of the text fields. Variants for with and without an image.
-const CGFloat kTextXPositionNoImage = kFramePadding;
-const CGFloat kTextXPosition =
-    kTextXPositionNoImage + kImageSize + kImageSpacing;
-
-// The X offset for the help button.
-const CGFloat kButtonXOffset = kTextXPosition;
-
-}  // namespace
-
-#pragma mark - PageInfoViewController
-
-@interface PageInfoViewController () {
-  // Scroll View inside the PageInfoView used to display content that exceeds
-  // the available space.
-  UIScrollView* _scrollView;
-  // Container View added inside the Scroll View. All content is added to this
-  // view.
-  BidiContainerView* _innerContainerView;
-
-  // Origin of the arrow at the top of the popup window.
-  CGPoint _arrowOriginPoint;
-
-  // Model for the data to display.
-  std::unique_ptr<PageInfoModel> _model;
-
-  // Width of the view. Depends on the device (iPad/iPhone).
-  CGFloat _viewWidth;
-
-  // Width of the text fields.
-  CGFloat _textWidth;
-
-  // YES when the popup has finished animating in. NO otherwise.
-  BOOL _displayAnimationCompleted;
-}
-
-@property(nonatomic, strong) UIView* containerView;
-@property(nonatomic, strong) UIView* popupContainer;
-// An invisible button added to the |containerView|. Closes the popup just like
-// the tap on the background. Exposed purely for voiceover purposes.
-@property(nonatomic, strong) UIButton* closeButton;
-
-@end
-
 @implementation PageInfoViewController
 
-#pragma mark public
-
-- (id)initWithModel:(PageInfoModel*)model
-             sourcePoint:(CGPoint)sourcePoint
-    presentationProvider:(id<PageInfoPresentation>)provider
-              dispatcher:(id<PageInfoCommands, PageInfoReloading>)dispatcher {
-  DCHECK(provider);
-  self = [super init];
-  if (self) {
-    _scrollView =
-        [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, 240, 128)];
-    [_scrollView setMultipleTouchEnabled:YES];
-    [_scrollView setClipsToBounds:YES];
-    [_scrollView setShowsHorizontalScrollIndicator:NO];
-    [_scrollView setIndicatorStyle:UIScrollViewIndicatorStyleBlack];
-    [_scrollView
-        setAutoresizingMask:(UIViewAutoresizingFlexibleTrailingMargin() |
-                             UIViewAutoresizingFlexibleTopMargin)];
-
-    _innerContainerView =
-        [[BidiContainerView alloc] initWithFrame:CGRectMake(0, 0, 194, 327)];
-    [_innerContainerView
-        setAccessibilityLabel:@"Page Security Info Scroll Container"];
-    [_innerContainerView
-        setAutoresizingMask:(UIViewAutoresizingFlexibleTrailingMargin() |
-                             UIViewAutoresizingFlexibleBottomMargin)];
-
-    _model.reset(model);
-    _arrowOriginPoint = sourcePoint;
-    _dispatcher = dispatcher;
-
-    UIInterfaceOrientation orientation =
-        [[UIApplication sharedApplication] statusBarOrientation];
-    _viewWidth = IsCompactWidth() ? kViewWidthCompact : kViewWidthRegular;
-    // Special case iPhone landscape.
-    if (!IsIPadIdiom() && UIInterfaceOrientationIsLandscape(orientation))
-      _viewWidth = kViewWidthiPhoneLandscape;
-
-    _textWidth = _viewWidth - (kImageSize + kImageSpacing + kFramePadding * 2 +
-                               kScrollViewInset * 2);
-
-    _containerView = [[UIView alloc] init];
-    [_containerView setBackgroundColor:[UIColor colorWithWhite:0
-                                                         alpha:kShieldAlpha]];
-    [_containerView setOpaque:NO];
-    [_containerView setAlpha:0];
-    [_containerView setAccessibilityViewIsModal:YES];
-    _containerView.accessibilityIdentifier =
-        kPageInfoViewAccessibilityIdentifier;
-
-    // Set up an invisible button that closes the popup.
-    _closeButton = [[UIButton alloc] init];
-    _closeButton.accessibilityLabel = l10n_util::GetNSString(IDS_DONE);
-    [_closeButton addTarget:dispatcher
-                     action:@selector(hidePageInfo)
-           forControlEvents:UIControlEventTouchDown];
-    [_containerView addSubview:_closeButton];
-
-    _popupContainer = [[UIView alloc] initWithFrame:CGRectZero];
-    [_popupContainer setBackgroundColor:UIColor.cr_systemBackgroundColor];
-    [_popupContainer setClipsToBounds:YES];
-    _popupContainer.userInteractionEnabled = YES;
-    [_containerView addSubview:_popupContainer];
-
-    [self.popupContainer addSubview:_scrollView];
-    [_scrollView addSubview:_innerContainerView];
-    [_scrollView setAccessibilityIdentifier:@"Page Security Scroll View"];
-    [provider presentPageInfoView:self.containerView];
-    [self performLayout];
-
-    [self animatePageInfoViewIn:sourcePoint];
-    UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification,
-                                    _containerView);
-  }
-
-  return self;
-}
-
-- (void)performLayout {
-  CGFloat offset = kInitialLinePadding;
-
-  // Keep the new subviews in an array that gets replaced at the end.
-  NSMutableArray* subviews = [NSMutableArray array];
-
-  int sectionCount = _model->GetSectionCount();
-  PageInfoModel::ButtonAction action = PageInfoModel::BUTTON_NONE;
-
-  for (int i = 0; i < sectionCount; i++) {
-    PageInfoModel::SectionInfo info = _model->GetSectionInfo(i);
-
-    if (action == PageInfoModel::BUTTON_NONE &&
-        info.button != PageInfoModel::BUTTON_NONE) {
-      // Show the button corresponding to the first section that requires a
-      // button.
-      action = info.button;
-    }
-
-    // Only certain sections have images. This affects the X position.
-    BOOL hasImage = _model->GetIconImage(info.icon_id) != nil;
-    CGFloat xPosition = (hasImage ? kTextXPosition : kTextXPositionNoImage);
-
-    // Insert the image subview for sections that are appropriate.
-    CGFloat imageBaseline = offset + kImageSize;
-    if (hasImage) {
-      [self addImageViewForInfo:info
-                     toSubviews:subviews
-                       atOffset:offset + PageInfoImageVerticalOffset()];
-    }
-
-    // Add the title.
-    if (!info.headline.empty()) {
-      offset += [self addHeadlineViewForInfo:info
-                                  toSubviews:subviews
-                                     atPoint:CGPointMake(xPosition, offset)];
-      offset += kHeadlineSpacing;
-    }
-
-    // Create the description of the state.
-    offset += [self addDescriptionViewForInfo:info
-                                   toSubviews:subviews
-                                      atPoint:CGPointMake(xPosition, offset)];
-
-    // If at this point the description and optional headline and button are
-    // not as tall as the image, adjust the offset by the difference.
-    CGFloat imageBaselineDelta = imageBaseline - offset;
-    if (imageBaselineDelta > 0)
-      offset += imageBaselineDelta;
-
-    // Add the separators.
-    int testSectionCount = sectionCount - 1;
-    if (i != testSectionCount ||
-        (i == testSectionCount && action != PageInfoModel::BUTTON_NONE)) {
-      offset += kVerticalSpacing;
-    }
-  }
-
-  // The last item at the bottom of the window is the help center link. Do not
-  // show this for the internal pages, which have one section.
-  offset += [self addButton:action toSubviews:subviews atOffset:offset];
-
-  // Add the bottom padding.
-  offset += kVerticalSpacing;
-  CGRect frame = CGRectMake(kInitialFramePosition, _arrowOriginPoint.y,
-                            _viewWidth, offset);
-
-  // Increase the size of the frame by the amount used for drawing rounded
-  // corners and shadow.
-  frame.size.height += kPageInfoViewFooterSize;
-
-  if (CGRectGetMaxY(frame) >
-      CGRectGetMaxY([[self containerView] superview].bounds) -
-          kFrameBottomPadding) {
-    // If the frame is bigger than the parent view than change the frame to
-    // fit in the superview bounds.
-    frame.size.height = [[self containerView] superview].bounds.size.height -
-                        kFrameBottomPadding - frame.origin.y;
-
-    [_scrollView setScrollEnabled:YES];
-    [_scrollView flashScrollIndicators];
-  } else {
-    [_scrollView setScrollEnabled:NO];
-  }
-
-  CGRect containerBounds = [_containerView bounds];
-  CGRect popupFrame = frame;
-  popupFrame.origin.x =
-      CGRectGetMidX(containerBounds) - CGRectGetWidth(popupFrame) / 2.0;
-  popupFrame.origin.y =
-      CGRectGetMidY(containerBounds) - CGRectGetHeight(popupFrame) / 2.0;
-
-  popupFrame.origin = AlignPointToPixel(popupFrame.origin);
-  CGRect innerFrame = CGRectMake(0, 0, popupFrame.size.width, offset);
-
-  // If the initial animation has completed, animate the new frames.
-  if (_displayAnimationCompleted) {
-    [UIView cr_animateWithDuration:ios::material::kDuration3
-                             delay:0
-                             curve:ios::material::CurveEaseInOut
-                           options:0
-                        animations:^{
-                          [_popupContainer setFrame:popupFrame];
-                          [_scrollView setFrame:[_popupContainer bounds]];
-                          [_innerContainerView setFrame:innerFrame];
-                        }
-                        completion:nil];
-  } else {
-    // Popup hasn't finished animating in yet. Set frames immediately.
-    [_popupContainer setFrame:popupFrame];
-    [_scrollView setFrame:[_popupContainer bounds]];
-    [_innerContainerView setFrame:innerFrame];
-  }
-
-  for (UIView* view in [_innerContainerView subviews]) {
-    [view removeFromSuperview];
-  }
-
-  for (UIView* view in subviews) {
-    [_innerContainerView addSubview:view];
-    [_innerContainerView setSubviewNeedsAdjustmentForRTL:view];
-  }
-
-  [_scrollView setContentSize:_innerContainerView.frame.size];
-  _closeButton.frame = _containerView.bounds;
-}
-
-- (void)dismiss {
-  [self animatePageInfoViewOut];
-  UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification,
-                                  nil);
-}
-
-#pragma mark - internal
-
-- (BOOL)accessibilityPerformEscape {
-  [self.dispatcher hidePageInfo];
-  return YES;
-}
-
-- (void)animatePageInfoViewIn:(CGPoint)sourcePoint {
-  // Animate the info card itself.
-  CATransform3D scaleTransform = PageInfoAnimationScale();
-
-  CABasicAnimation* scaleAnimation =
-      [CABasicAnimation animationWithKeyPath:@"transform"];
-  [scaleAnimation setFromValue:[NSValue valueWithCATransform3D:scaleTransform]];
-
-  CABasicAnimation* positionAnimation =
-      [CABasicAnimation animationWithKeyPath:@"position"];
-  [positionAnimation setFromValue:[NSValue valueWithCGPoint:sourcePoint]];
-
-  CAAnimationGroup* sizeAnimation = [CAAnimationGroup animation];
-  [sizeAnimation setAnimations:@[ scaleAnimation, positionAnimation ]];
-  [sizeAnimation
-      setTimingFunction:TimingFunction(ios::material::CurveEaseInOut)];
-  [sizeAnimation setDuration:ios::material::kDuration3];
-
-  CABasicAnimation* fadeAnimation =
-      [CABasicAnimation animationWithKeyPath:@"opacity"];
-  [fadeAnimation setTimingFunction:TimingFunction(ios::material::CurveEaseOut)];
-  [fadeAnimation setDuration:ios::material::kDuration6];
-  [fadeAnimation setFromValue:@0];
-  [fadeAnimation setToValue:@1];
-
-  [[_popupContainer layer] addAnimation:fadeAnimation forKey:@"fade"];
-  [[_popupContainer layer] addAnimation:sizeAnimation forKey:@"size"];
-
-  // Animation the background grey overlay.
-  CABasicAnimation* overlayAnimation =
-      [CABasicAnimation animationWithKeyPath:@"opacity"];
-  [overlayAnimation
-      setTimingFunction:TimingFunction(ios::material::CurveEaseOut)];
-  [overlayAnimation setDuration:ios::material::kDuration3];
-  [overlayAnimation setFromValue:@0];
-  [overlayAnimation setToValue:@1];
-
-  [[_containerView layer] addAnimation:overlayAnimation forKey:@"fade"];
-  [_containerView setAlpha:1];
-
-  // Animate the contents of the info card.
-  CALayer* contentsLayer = [_innerContainerView layer];
-
-  CGRect startFrame = CGRectOffset([_innerContainerView frame], 0, -32);
-  CAAnimation* contentSlideAnimation = FrameAnimationMake(
-      contentsLayer, startFrame, [_innerContainerView frame]);
-  [contentSlideAnimation
-      setTimingFunction:TimingFunction(ios::material::CurveEaseOut)];
-  [contentSlideAnimation setDuration:ios::material::kDuration5];
-  contentSlideAnimation =
-      DelayedAnimationMake(contentSlideAnimation, ios::material::kDuration2);
-  [contentsLayer addAnimation:contentSlideAnimation forKey:@"slide"];
-
-  [CATransaction begin];
-  [CATransaction setCompletionBlock:^{
-    [_innerContainerView setAlpha:1];
-    _displayAnimationCompleted = YES;
-  }];
-  CAAnimation* contentFadeAnimation = OpacityAnimationMake(0.0, 1.0);
-  [contentFadeAnimation
-      setTimingFunction:TimingFunction(ios::material::CurveEaseOut)];
-  [contentFadeAnimation setDuration:ios::material::kDuration5];
-  contentFadeAnimation =
-      DelayedAnimationMake(contentFadeAnimation, ios::material::kDuration1);
-  [contentsLayer addAnimation:contentFadeAnimation forKey:@"fade"];
-  [CATransaction commit];
-
-  // Since the animations have delay on them, the alpha of the content view
-  // needs to be set to zero and then one after the animation starts. If these
-  // steps are not taken, there will be a visible flash/jump from the initial
-  // spot during the animation.
-  [_innerContainerView setAlpha:0];
-}
-
-- (void)animatePageInfoViewOut {
-  [CATransaction begin];
-  [CATransaction setCompletionBlock:^{
-    [self.containerView removeFromSuperview];
-  }];
-
-  CABasicAnimation* opacityAnimation =
-      [CABasicAnimation animationWithKeyPath:@"opacity"];
-  [opacityAnimation
-      setTimingFunction:TimingFunction(ios::material::CurveEaseIn)];
-  [opacityAnimation setDuration:ios::material::kDuration3];
-  [opacityAnimation setFromValue:@1];
-  [opacityAnimation setToValue:@0];
-  [[_containerView layer] addAnimation:opacityAnimation forKey:@"animateOut"];
-
-  [_popupContainer setAlpha:0];
-  [_containerView setAlpha:0];
-  [CATransaction commit];
-}
-
-#pragma mark - Helper methods to create subviews.
-
-// Adds the state image at a pre-determined x position and the given y. This
-// does not affect the next Y position because the image is placed next to
-// a text field that is larger and accounts for the image's size.
-- (void)addImageViewForInfo:(const PageInfoModel::SectionInfo&)info
-                 toSubviews:(NSMutableArray*)subviews
-                   atOffset:(CGFloat)offset {
-  CGRect frame = CGRectMake(kFramePadding, offset, kImageSize, kImageSize);
-  UIImageView* imageView = [[UIImageView alloc] initWithFrame:frame];
-  imageView.tintColor = UIColor.cr_labelColor;
-  UIImage* image = [_model->GetIconImage(info.icon_id)->ToUIImage()
-      imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-  [imageView setImage:image];
-  [subviews addObject:imageView];
-}
-
-// Adds the title text field at the given x,y position, and returns the y
-// position for the next element.
-- (CGFloat)addHeadlineViewForInfo:(const PageInfoModel::SectionInfo&)info
-                       toSubviews:(NSMutableArray*)subviews
-                          atPoint:(CGPoint)point {
-  CGRect frame = CGRectMake(point.x, point.y, _textWidth, kHeadlineHeight);
-  UILabel* label = [[UILabel alloc] initWithFrame:frame];
-  [label setTextAlignment:NSTextAlignmentNatural];
-  [label setText:base::SysUTF16ToNSString(info.headline)];
-  [label setTextColor:UIColor.cr_labelColor];
-  [label setFont:PageInfoHeadlineFont()];
-  [label setFrame:frame];
-  [label setLineBreakMode:NSLineBreakByTruncatingHead];
-  [subviews addObject:label];
-  return CGRectGetHeight(frame);
-}
-
-// Adds the description text field at the given x,y position, and returns the y
-// position for the next element.
-- (CGFloat)addDescriptionViewForInfo:(const PageInfoModel::SectionInfo&)info
-                          toSubviews:(NSMutableArray*)subviews
-                             atPoint:(CGPoint)point {
-  CGRect frame = CGRectMake(point.x, point.y, _textWidth, kImageSize);
-  UILabel* label = [[UILabel alloc] initWithFrame:frame];
-  [label setTextAlignment:NSTextAlignmentNatural];
-  NSString* description = base::SysUTF16ToNSString(info.description);
-  UIFont* font = [MDCTypography captionFont];
-  [label setTextColor:UIColor.cr_labelColor];
-  [label setText:description];
-  [label setFont:font];
-  [label setNumberOfLines:0];
-
-  // If the text is oversized, resize the text field.
-  CGSize constraintSize = CGSizeMake(_textWidth, CGFLOAT_MAX);
-  CGSize sizeToFit =
-      [description cr_boundingSizeWithSize:constraintSize font:font];
-  frame.size.height = sizeToFit.height;
-  [label setFrame:frame];
-  [subviews addObject:label];
-  return CGRectGetHeight(frame);
-}
-
-// Returns a button with title and action configured for |buttonAction|.
-- (UIButton*)buttonForAction:(PageInfoModel::ButtonAction)buttonAction {
-  if (buttonAction == PageInfoModel::BUTTON_NONE) {
-    return nil;
-  }
-  UIButton* button = [[UIButton alloc] initWithFrame:CGRectZero];
-  int messageId;
-  NSString* accessibilityID = @"Reload button";
-  switch (buttonAction) {
-    case PageInfoModel::BUTTON_NONE:
-      NOTREACHED();
-      return nil;
-    case PageInfoModel::BUTTON_SHOW_SECURITY_HELP:
-      messageId = IDS_LEARN_MORE;
-      accessibilityID = @"Learn more";
-      [button addTarget:self.dispatcher
-                    action:@selector(showSecurityHelpPage)
-          forControlEvents:UIControlEventTouchUpInside];
-      break;
-    case PageInfoModel::BUTTON_RELOAD:
-      messageId = IDS_IOS_PAGE_INFO_RELOAD;
-      accessibilityID = @"Reload button";
-      [button addTarget:self.dispatcher
-                    action:@selector(hidePageInfo)
-          forControlEvents:UIControlEventTouchUpInside];
-      [button addTarget:self.dispatcher
-                    action:@selector(reload)
-          forControlEvents:UIControlEventTouchUpInside];
-      break;
-  };
-
-  NSString* title = l10n_util::GetNSStringWithFixup(messageId);
-  SetA11yLabelAndUiAutomationName(button, messageId, accessibilityID);
-  [button setTitle:title forState:UIControlStateNormal];
-  return button;
-}
-
-// Adds the the button |buttonAction| that explains the icons. Returns the y
-// position delta for the next offset.
-- (CGFloat)addButton:(PageInfoModel::ButtonAction)buttonAction
-          toSubviews:(NSMutableArray*)subviews
-            atOffset:(CGFloat)offset {
-  UIButton* button = [self buttonForAction:buttonAction];
-  if (!button) {
-    return 0;
-  }
-  // The size of the initial frame is irrelevant since it will be changed based
-  // on the size for the string inside.
-  CGRect frame = CGRectMake(kButtonXOffset, offset, 100, 10);
-
-  UIFont* font = [MDCTypography captionFont];
-  CGSize sizeWithFont =
-      [[[button titleLabel] text] cr_pixelAlignedSizeWithFont:font];
-  frame.size = sizeWithFont;
-  // According to iOS Human Interface Guidelines, minimal size of UIButton
-  // should be 44x44.
-  frame.size.height = std::max<CGFloat>(44, frame.size.height);
-
-  [button setFrame:frame];
-
-  [button.titleLabel setFont:font];
-  [button.titleLabel setTextAlignment:NSTextAlignmentLeft];
-  [button setTitleColor:[UIColor colorNamed:kBlueColor]
-               forState:UIControlStateNormal];
-  [button setTitleColor:[UIColor colorNamed:kBlueColor]
-               forState:UIControlStateSelected];
-
-  [subviews addObject:button];
-
-  return CGRectGetHeight([button frame]);
-}
-
 @end

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

@@ -65,6 +65,7 @@ source_set("popup_menu") {
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/ntp_tile_views:constants",
+    "//ios/chrome/browser/ui/page_info:features",
     "//ios/chrome/browser/ui/popup_menu/cells",
     "//ios/chrome/browser/ui/popup_menu/public",
     "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui",

ios/chrome/browser/ui/popup_menu/popup_menu_action_handler.mm

@@ -14,6 +14,7 @@
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 #import "ios/chrome/browser/ui/commands/load_query_commands.h"
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
+#import "ios/chrome/browser/ui/page_info/features.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_action_handler_commands.h"
 #import "ios/chrome/browser/ui/popup_menu/public/cells/popup_menu_item.h"
 #import "ios/chrome/browser/ui/popup_menu/public/popup_menu_table_view_controller.h"
@@ -84,8 +85,13 @@ using base::UserMetricsAction;
       break;
     case PopupMenuActionSiteInformation:
       RecordAction(UserMetricsAction("MobileMenuSiteInformation"));
+      if (base::FeatureList::IsEnabled(kPageInfoRefactoring)) {
+        [self.dispatcher showPageInfo];
+      } else {
         [self.dispatcher
-          showPageInfoForOriginPoint:self.baseViewController.view.center];
+            legacyShowPageInfoForOriginPoint:self.baseViewController.view
+                                                 .center];
+      }
       break;
     case PopupMenuActionReportIssue:
       RecordAction(UserMetricsAction("MobileMenuReportAnIssue"));