[iOS] Preparing Page info site security

This CL Renames page_info_legacy_coordinator. and  page_info_config.
files, preparing for the implementation of the page info site security.

Bug: 1038919
Change-Id: I91a62fd92589f1f6b406b4680c7f7bc1636b24de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089849
Commit-Queue: Ewann Pellé <ewannpv@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748146}

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

@@ -7,12 +7,12 @@ source_set("page_info") {
   sources = [
     "legacy_page_info_view_controller.h",
     "legacy_page_info_view_controller.mm",
-    "page_info_config.h",
-    "page_info_config.mm",
     "page_info_consumer.h",
     "page_info_description.h",
     "page_info_description.mm",
     "page_info_navigation_commands.h",
+    "page_info_site_security_description.h",
+    "page_info_site_security_description.mm",
     "page_info_site_security_view_controller.h",
     "page_info_site_security_view_controller.mm",
     "page_info_view_controller.h",
@@ -67,14 +67,14 @@ source_set("features") {
 source_set("coordinator") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "legacy_page_info_mediator.h",
-    "legacy_page_info_mediator.mm",
     "page_info_coordinator.h",
     "page_info_coordinator.mm",
     "page_info_legacy_coordinator.h",
     "page_info_legacy_coordinator.mm",
     "page_info_mediator.h",
     "page_info_mediator.mm",
+    "page_info_site_security_mediator.h",
+    "page_info_site_security_mediator.mm",
   ]
   deps = [
     ":page_info",

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

@@ -12,7 +12,7 @@
 #include "base/memory/weak_ptr.h"
 
 @protocol BrowserCommands;
-@class PageInfoConfig;
+@class PageInfoSiteSecurityDescription;
 @protocol PageInfoPresentation;
 
 // The view controller for the page info view.
@@ -21,7 +21,7 @@
 // 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:(PageInfoConfig*)model
+- (id)initWithModel:(PageInfoSiteSecurityDescription*)model
              sourcePoint:(CGPoint)sourcePoint
     presentationProvider:(id<PageInfoPresentation>)provider
                  handler:(id<BrowserCommands>)handler;

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

@@ -14,8 +14,8 @@
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 #import "ios/chrome/browser/ui/fancy_ui/bidi_container_view.h"
-#include "ios/chrome/browser/ui/page_info/page_info_config.h"
 #import "ios/chrome/browser/ui/page_info/page_info_constants.h"
+#include "ios/chrome/browser/ui/page_info/page_info_site_security_description.h"
 #import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h"
 #import "ios/chrome/browser/ui/util/animation_util.h"
 #include "ios/chrome/browser/ui/util/rtl_geometry.h"
@@ -105,7 +105,7 @@ const CGFloat kButtonXOffset = kTextXPosition;
   CGPoint _arrowOriginPoint;
 
   // Model for the data to display.
-  PageInfoConfig* _model;
+  PageInfoSiteSecurityDescription* _model;
 
   // Width of the view. Depends on the device (iPad/iPhone).
   CGFloat _viewWidth;
@@ -129,7 +129,7 @@ const CGFloat kButtonXOffset = kTextXPosition;
 
 #pragma mark public
 
-- (id)initWithModel:(PageInfoConfig*)model
+- (id)initWithModel:(PageInfoSiteSecurityDescription*)model
              sourcePoint:(CGPoint)sourcePoint
     presentationProvider:(id<PageInfoPresentation>)provider
                  handler:(id<BrowserCommands>)handler {
@@ -242,7 +242,7 @@ const CGFloat kButtonXOffset = kTextXPosition;
     offset += imageBaselineDelta;
 
   // Add the separators.
-  if (_model.buttonAction != PageInfoButtonActionNone) {
+  if (_model.buttonAction != PageInfoSiteSecurityButtonActionNone) {
     offset += kVerticalSpacing;
   }
 
@@ -482,24 +482,24 @@ const CGFloat kButtonXOffset = kTextXPosition;
 
 // Returns a button with title and action configured for |buttonAction|.
 - (UIButton*)buttonForAction:(PageInfoButtonAction)buttonAction {
-  if (buttonAction == PageInfoButtonActionNone) {
+  if (buttonAction == PageInfoSiteSecurityButtonActionNone) {
     return nil;
   }
   UIButton* button = [[UIButton alloc] initWithFrame:CGRectZero];
   int messageId;
   NSString* accessibilityID = @"Reload button";
   switch (buttonAction) {
-    case PageInfoButtonActionNone:
+    case PageInfoSiteSecurityButtonActionNone:
       NOTREACHED();
       return nil;
-    case PageInfoButtonActionShowHelp:
+    case PageInfoSiteSecurityButtonActionShowHelp:
       messageId = IDS_LEARN_MORE;
       accessibilityID = @"Learn more";
       [button addTarget:self.handler
                     action:@selector(showSecurityHelpPage)
           forControlEvents:UIControlEventTouchUpInside];
       break;
-    case PageInfoButtonActionReload:
+    case PageInfoSiteSecurityButtonActionReload:
       messageId = IDS_IOS_PAGE_INFO_RELOAD;
       accessibilityID = @"Reload button";
       [button addTarget:self.handler

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

@@ -17,9 +17,9 @@
 #import "ios/chrome/browser/ui/commands/command_dispatcher.h"
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/ui/fullscreen/chrome_coordinator+fullscreen_disabling.h"
-#import "ios/chrome/browser/ui/page_info/legacy_page_info_mediator.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"
+#import "ios/chrome/browser/ui/page_info/page_info_site_security_mediator.h"
 #import "ios/chrome/browser/ui/page_info/requirements/page_info_presentation.h"
 #import "ios/chrome/browser/url_loading/url_loading_params.h"
 #import "ios/chrome/browser/url_loading/url_loading_service.h"
@@ -83,10 +83,10 @@
   bool presentingOfflinePage =
       OfflinePageTabHelper::FromWebState(webState)->presenting_offline_page();
 
-  PageInfoConfig* config =
-      [LegacyPageInfoMediator configurationForURL:navItem->GetURL()
-                                        SSLStatus:navItem->GetSSL()
-                                      offlinePage:presentingOfflinePage];
+  PageInfoSiteSecurityDescription* config =
+      [PageInfoSiteSecurityMediator configurationForURL:navItem->GetURL()
+                                              SSLStatus:navItem->GetSSL()
+                                            offlinePage:presentingOfflinePage];
 
   CGPoint originPresentationCoordinates = [self.presentationProvider
       convertToPresentationCoordinatesForOrigin:self.originPoint];

ios/chrome/browser/ui/page_info/page_info_config.h → ios/chrome/browser/ui/page_info/page_info_site_security_description.h

@@ -2,23 +2,23 @@
 // 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_CONFIG_H_
-#define IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_CONFIG_H_
+#ifndef IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_SITE_SECURITY_DESCRIPTION_H_
+#define IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_SITE_SECURITY_DESCRIPTION_H_
 
 #import <UIKit/UIKit.h>
 
-// Types of the different actions the page info button can have.
+// Types of the different actions the page info site security button can have.
 typedef NS_ENUM(NSUInteger, PageInfoButtonAction) {
   // No action.
-  PageInfoButtonActionNone,
+  PageInfoSiteSecurityButtonActionNone,
   // Show the help page.
-  PageInfoButtonActionShowHelp,
+  PageInfoSiteSecurityButtonActionShowHelp,
   // Reload the page.
-  PageInfoButtonActionReload,
+  PageInfoSiteSecurityButtonActionReload,
 };
 
-// Config for the information displayed by the PageInfo.
-@interface PageInfoConfig : NSObject
+// Config for the information displayed by the page info site security.
+@interface PageInfoSiteSecurityDescription : NSObject
 
 @property(nonatomic, copy) NSString* title;
 @property(nonatomic, copy) NSString* message;
@@ -27,4 +27,4 @@ typedef NS_ENUM(NSUInteger, PageInfoButtonAction) {
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_CONFIG_H_
+#endif  // IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_SITE_SECURITY_DESCRIPTION_H_

ios/chrome/browser/ui/page_info/page_info_config.mm → ios/chrome/browser/ui/page_info/page_info_site_security_description.mm

@@ -2,12 +2,12 @@
 // 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_config.h"
+#import "ios/chrome/browser/ui/page_info/page_info_site_security_description.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
-@implementation PageInfoConfig
+@implementation PageInfoSiteSecurityDescription
 
 @end

ios/chrome/browser/ui/page_info/legacy_page_info_mediator.h → ios/chrome/browser/ui/page_info/page_info_site_security_mediator.h

@@ -2,8 +2,8 @@
 // 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_MEDIATOR_H_
-#define IOS_CHROME_BROWSER_UI_PAGE_INFO_LEGACY_PAGE_INFO_MEDIATOR_H_
+#ifndef IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_SITE_SECURITY_MEDIATOR_H_
+#define IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_SITE_SECURITY_MEDIATOR_H_
 
 #import <Foundation/Foundation.h>
 
@@ -11,22 +11,22 @@ namespace web {
 struct SSLStatus;
 }
 
-@class PageInfoConfig;
+@class PageInfoSiteSecurityDescription;
 class GURL;
 
-// Mediator for the PageInfo, extracting the data to be displayed for the web
-// informations.
-@interface LegacyPageInfoMediator : NSObject
+// Mediator for the page info site security, extracting the data to be displayed
+// for the view controller.
+@interface PageInfoSiteSecurityMediator : NSObject
 
 // For now this object only have static method.
 - (instancetype)init NS_UNAVAILABLE;
 
 // Returns a configuration based on the |URL|, the SSL |status| and if the
 // current page is an |offlinePage|.
-+ (PageInfoConfig*)configurationForURL:(const GURL&)URL
-                             SSLStatus:(web::SSLStatus&)status
-                           offlinePage:(BOOL)offlinePage;
++ (PageInfoSiteSecurityDescription*)configurationForURL:(const GURL&)URL
+                                              SSLStatus:(web::SSLStatus&)status
+                                            offlinePage:(BOOL)offlinePage;
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_PAGE_INFO_LEGACY_PAGE_INFO_MEDIATOR_H_
+#endif  // IOS_CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_SITE_SECURITY_MEDIATOR_H_

ios/chrome/browser/ui/page_info/legacy_page_info_mediator.mm → ios/chrome/browser/ui/page_info/page_info_site_security_mediator.mm

@@ -2,7 +2,7 @@
 // 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_mediator.h"
+#import "ios/chrome/browser/ui/page_info/page_info_site_security_mediator.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ -12,7 +12,7 @@
 #include "components/strings/grit/components_google_chrome_strings.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
-#import "ios/chrome/browser/ui/page_info/page_info_config.h"
+#import "ios/chrome/browser/ui/page_info/page_info_site_security_description.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/web/public/security/ssl_status.h"
@@ -61,17 +61,18 @@ NSString* BuildMessage(NSArray<NSString*>* messageComponents) {
 
 }  // namespace
 
-@implementation LegacyPageInfoMediator
+@implementation PageInfoSiteSecurityMediator
 
-+ (PageInfoConfig*)configurationForURL:(const GURL&)URL
-                             SSLStatus:(web::SSLStatus&)status
-                           offlinePage:(BOOL)offlinePage {
-  PageInfoConfig* dataHolder = [[PageInfoConfig alloc] init];
++ (PageInfoSiteSecurityDescription*)configurationForURL:(const GURL&)URL
+                                              SSLStatus:(web::SSLStatus&)status
+                                            offlinePage:(BOOL)offlinePage {
+  PageInfoSiteSecurityDescription* dataHolder =
+      [[PageInfoSiteSecurityDescription alloc] init];
   if (offlinePage) {
     dataHolder.title = l10n_util::GetNSString(IDS_IOS_PAGE_INFO_OFFLINE_TITLE);
     dataHolder.message = l10n_util::GetNSString(IDS_IOS_PAGE_INFO_OFFLINE_PAGE);
     dataHolder.image = [UIImage imageNamed:@"page_info_offline"];
-    dataHolder.buttonAction = PageInfoButtonActionReload;
+    dataHolder.buttonAction = PageInfoSiteSecurityButtonActionReload;
     return dataHolder;
   }
 
@@ -79,13 +80,13 @@ NSString* BuildMessage(NSArray<NSString*>* messageComponents) {
     dataHolder.title = base::SysUTF8ToNSString(URL.spec());
     dataHolder.message = l10n_util::GetNSString(IDS_PAGE_INFO_INTERNAL_PAGE);
     dataHolder.image = nil;
-    dataHolder.buttonAction = PageInfoButtonActionNone;
+    dataHolder.buttonAction = PageInfoSiteSecurityButtonActionNone;
     return dataHolder;
   }
 
   // At this point, this is a web page.
   dataHolder.title = base::SysUTF8ToNSString(URL.host());
-  dataHolder.buttonAction = PageInfoButtonActionShowHelp;
+  dataHolder.buttonAction = PageInfoSiteSecurityButtonActionShowHelp;
 
   // Summary and details.
   if (!status.certificate) {