[iOS] Remove legacy omnibox classes.

Removes pre-HL popup classes.

Bug: 943521
Change-Id: Ife98510b8d0142df487d7aef0fab08494ab2cdf0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007569
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Reviewed-by: Robbie Gibson <rkgibson@google.com>
Cr-Commit-Position: refs/heads/master@{#733956}

ios/chrome/browser/ui/omnibox/popup/BUILD.gn

@@ -67,10 +67,6 @@ source_set("popup_ui") {
     "omnibox_popup_base_view_controller+internal.h",
     "omnibox_popup_base_view_controller.h",
     "omnibox_popup_base_view_controller.mm",
-    "omnibox_popup_legacy_view_controller.h",
-    "omnibox_popup_legacy_view_controller.mm",
-    "omnibox_popup_row.h",
-    "omnibox_popup_row.mm",
     "omnibox_popup_row_cell.h",
     "omnibox_popup_row_cell.mm",
     "omnibox_popup_view_controller.h",
@@ -136,10 +132,7 @@ source_set("popup_internal") {
 source_set("unit_tests") {
   configs += [ "//build/config/compiler:enable_arc" ]
   testonly = true
-  sources = [
-    "omnibox_popup_row_cell_unittest.mm",
-    "omnibox_popup_view_controller_unittest.mm",
-  ]
+  sources = [ "omnibox_popup_row_cell_unittest.mm" ]
   deps = [
     ":popup",
     ":popup_internal",

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_base_view_controller.h

@@ -10,7 +10,6 @@
 #import "ios/chrome/browser/ui/commands/omnibox_suggestion_commands.h"
 #import "ios/chrome/browser/ui/omnibox/popup/autocomplete_result_consumer.h"
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_base_view_controller.h"
-#include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h"
 
 @protocol ImageRetriever;
 @protocol FaviconRetriever;

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_base_view_controller.mm

@@ -9,7 +9,6 @@
 #include "base/time/time.h"
 #import "ios/chrome/browser/ui/ntp_tile_views/ntp_tile_layout_util.h"
 #include "ios/chrome/browser/ui/omnibox/omnibox_constants.h"
-#include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h"
 #include "ios/chrome/browser/ui/omnibox/popup/self_sizing_table_view.h"
 #include "ios/chrome/browser/ui/toolbar/buttons/toolbar_configuration.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_coordinator.mm

@@ -14,7 +14,6 @@
 #include "ios/chrome/browser/search_engines/template_url_service_factory.h"
 #import "ios/chrome/browser/ui/commands/command_dispatcher.h"
 #import "ios/chrome/browser/ui/ntp/ntp_util.h"
-#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_legacy_view_controller.h"
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h"
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_presenter.h"
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller.h"

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_legacy_view_controller.h

-// Copyright (c) 2019 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_OMNIBOX_POPUP_OMNIBOX_POPUP_LEGACY_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_LEGACY_VIEW_CONTROLLER_H_
-
-#import "ios/chrome/browser/ui/commands/omnibox_suggestion_commands.h"
-#import "ios/chrome/browser/ui/omnibox/popup/autocomplete_result_consumer.h"
-#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_base_view_controller.h"
-
-@interface OmniboxPopupLegacyViewController : OmniboxPopupBaseViewController
-@end
-
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_POPUP_OMNIBOX_POPUP_LEGACY_VIEW_CONTROLLER_H_

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h

-// Copyright (c) 2014 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_OMNIBOX_OMNIBOX_POPUP_ROW_H_
-#define IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_ROW_H_
-
-#import <UIKit/UIKit.h>
-
-@class FadeTruncatingLabel;
-
-@class OmniboxPopupRow;
-
-// Accessibility delegate for handling the row actions.
-@protocol OmniboxPopupRowAccessibilityDelegate
-
-// Handles the action associated with the trailing button of the |row|.
-- (void)accessibilityTrailingButtonTappedOmniboxPopupRow:(OmniboxPopupRow*)row;
-
-@end
-
-// View used to display an omnibox autocomplete match in the omnibox popup.
-@interface OmniboxPopupRow : UITableViewCell
-
-// A truncate-by-fading version of the textLabel of a UITableViewCell.
-@property(nonatomic, readonly, strong) FadeTruncatingLabel* textTruncatingLabel;
-// A truncate-by-fading version of the detailTextLabel of a UITableViewCell.
-@property(nonatomic, readonly, strong)
-    FadeTruncatingLabel* detailTruncatingLabel;
-// A standard UILabel for answers, which truncates with ellipses to support
-// multi-line text.
-@property(nonatomic, readonly, strong) UILabel* detailAnswerLabel;
-
-// Row number.
-@property(nonatomic, assign) NSUInteger rowNumber;
-
-// Accessibility delegate for this row.
-@property(nonatomic, weak) id<OmniboxPopupRowAccessibilityDelegate> delegate;
-
-@property(nonatomic, readonly, strong) UIImageView* imageView;
-@property(nonatomic, readonly, strong) UIImageView* answerImageView;
-@property(nonatomic, readonly, strong) UIButton* trailingButton;
-@property(nonatomic, assign) CGFloat rowHeight;
-// Whether this row is displaying a TabMatch. If YES, the trailing icon is
-// updated to reflect that.
-@property(nonatomic, assign, getter=isTabMatch) BOOL tabMatch;
-
-// Initialize the row with the given incognito state. The colors and styling are
-// dependent on whether or not the row is displayed in incognito mode.
-- (instancetype)initWithIncognito:(BOOL)incognito;
-
-// Update the match type icon with the supplied image ID and adjust its position
-// based on the current size of the row.
-- (void)updateLeadingImage:(UIImage*)image;
-
-// Callback for the accessibility action associated with the trailing button of
-// this row.
-- (void)accessibilityTrailingButtonTapped;
-
-@end
-
-#endif  // IOS_CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_POPUP_ROW_H_

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.mm

-// Copyright (c) 2014 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/omnibox/popup/omnibox_popup_row.h"
-
-#include "base/feature_list.h"
-#include "base/logging.h"
-#include "components/omnibox/common/omnibox_features.h"
-#import "ios/chrome/browser/ui/elements/fade_truncating_label.h"
-#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_accessibility_identifier_constants.h"
-#import "ios/chrome/browser/ui/toolbar/public/toolbar_constants.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/dynamic_color_util.h"
-#import "ios/chrome/common/colors/semantic_color_names.h"
-#include "ios/chrome/grit/ios_theme_resources.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace {
-// Side (w or h) length for the leading image view.
-const CGFloat kImageViewSize = 28.0;
-const CGFloat kImageViewCornerRadius = 7.0;
-const CGFloat kTrailingButtonTrailingMargin = 4;
-const CGFloat kTrailingButtonSize = 48.0;
-const CGFloat kLeadingPaddingIpad = 183;
-const CGFloat kLeadingPaddingIpadCompact = 71;
-}
-
-@interface OmniboxPopupRow () {
-  BOOL _incognito;
-}
-
-// Set the append button normal and highlighted images.
-- (void)updateTrailingButtonImages;
-
-@end
-
-@implementation OmniboxPopupRow
-
-@synthesize imageView = _imageView;
-
-- (instancetype)initWithStyle:(UITableViewCellStyle)style
-              reuseIdentifier:(NSString*)reuseIdentifier {
-  return [self initWithIncognito:NO];
-}
-
-- (instancetype)initWithIncognito:(BOOL)incognito {
-  self = [super initWithStyle:UITableViewCellStyleDefault
-              reuseIdentifier:@"OmniboxPopupRow"];
-  if (self) {
-    _incognito = incognito;
-
-    self.isAccessibilityElement = YES;
-    self.backgroundColor = UIColor.clearColor;
-    self.selectedBackgroundView = [[UIView alloc] initWithFrame:CGRectZero];
-    self.selectedBackgroundView.backgroundColor = color::DarkModeDynamicColor(
-        [UIColor colorNamed:kTableViewRowHighlightColor], _incognito,
-        [UIColor colorNamed:kTableViewRowHighlightDarkColor]);
-
-    _textTruncatingLabel =
-        [[FadeTruncatingLabel alloc] initWithFrame:CGRectZero];
-    _textTruncatingLabel.userInteractionEnabled = NO;
-    [self.contentView addSubview:_textTruncatingLabel];
-
-    _detailTruncatingLabel =
-        [[FadeTruncatingLabel alloc] initWithFrame:CGRectZero];
-    _detailTruncatingLabel.userInteractionEnabled = NO;
-    [self.contentView addSubview:_detailTruncatingLabel];
-
-    // Answers use a UILabel with NSLineBreakByTruncatingTail to produce a
-    // truncation with an ellipse instead of fading on multi-line text.
-    _detailAnswerLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-    _detailAnswerLabel.userInteractionEnabled = NO;
-    _detailAnswerLabel.lineBreakMode = NSLineBreakByTruncatingTail;
-    [self.contentView addSubview:_detailAnswerLabel];
-
-    _trailingButton = [UIButton buttonWithType:UIButtonTypeSystem];
-    [_trailingButton setContentMode:UIViewContentModeRight];
-    [self updateTrailingButtonImages];
-    // TODO(justincohen): Consider using the UITableViewCell's accessory view.
-    // The current implementation is from before using a UITableViewCell.
-    [self.contentView addSubview:_trailingButton];
-
-    // Before UI Refresh, the leading icon is only displayed on iPad. In UI
-    // Refresh, it's only in Regular x Regular size class.
-    // TODO(justincohen): Consider using the UITableViewCell's image view.
-    // The current implementation is from before using a UITableViewCell.
-    _imageView = [[UIImageView alloc] initWithFrame:CGRectZero];
-    _imageView.userInteractionEnabled = NO;
-    _imageView.contentMode = UIViewContentModeCenter;
-
-    _imageView.layer.cornerRadius = kImageViewCornerRadius;
-    _imageView.backgroundColor = UIColor.clearColor;
-    _imageView.tintColor = color::DarkModeDynamicColor(
-        [UIColor colorNamed:@"omnibox_suggestion_icon_color"], _incognito,
-        [UIColor colorNamed:@"omnibox_suggestion_icon_dark_color"]);
-
-    _answerImageView = [[UIImageView alloc] initWithFrame:CGRectZero];
-    _answerImageView.userInteractionEnabled = NO;
-    _answerImageView.contentMode = UIViewContentModeScaleAspectFit;
-    [self.contentView addSubview:_answerImageView];
-  }
-  return self;
-}
-
-- (void)layoutSubviews {
-  [super layoutSubviews];
-  [self layoutAccessoryViews];
-  if ([self showsLeadingIcons]) {
-    [self.contentView addSubview:_imageView];
-  } else {
-    [_imageView removeFromSuperview];
-  }
-}
-
-- (void)layoutAccessoryViews {
-  CGFloat imageViewSize = kImageViewSize;
-  LayoutRect imageViewLayout = LayoutRectMake(
-      ([self showsLeadingIcons] && IsCompactTablet())
-          ? kLeadingPaddingIpadCompact
-          : kLeadingPaddingIpad,
-      CGRectGetWidth(self.contentView.bounds),
-      floor((_rowHeight - imageViewSize) / 2), imageViewSize, imageViewSize);
-  _imageView.frame = LayoutRectGetRect(imageViewLayout);
-
-  LayoutRect trailingAccessoryLayout =
-      LayoutRectMake(CGRectGetWidth(self.contentView.bounds) -
-                         kTrailingButtonSize - kTrailingButtonTrailingMargin,
-                     CGRectGetWidth(self.contentView.bounds),
-                     floor((_rowHeight - kTrailingButtonSize) / 2),
-                     kTrailingButtonSize, kTrailingButtonSize);
-  _trailingButton.frame = LayoutRectGetRect(trailingAccessoryLayout);
-}
-
-- (void)updateLeadingImage:(UIImage*)image {
-  _imageView.image = image;
-
-  // Adjust the vertical position based on the current size of the row.
-  CGFloat imageViewSize = kImageViewSize;
-  CGRect frame = _imageView.frame;
-  frame.origin.y = floor((_rowHeight - imageViewSize) / 2);
-  _imageView.frame = frame;
-}
-
-- (void)setTabMatch:(BOOL)tabMatch {
-  _tabMatch = tabMatch;
-  [self updateTrailingButtonImages];
-}
-
-- (void)updateTrailingButtonImages {
-  UIImage* appendImage = nil;
-  _trailingButton.accessibilityIdentifier = nil;
-  if (self.tabMatch) {
-    appendImage = [UIImage imageNamed:@"omnibox_popup_tab_match"];
-    appendImage = appendImage.imageFlippedForRightToLeftLayoutDirection;
-    _trailingButton.accessibilityIdentifier =
-        kOmniboxPopupRowSwitchTabAccessibilityIdentifier;
-  } else {
-    int appendResourceID = 0;
-    appendResourceID = IDR_IOS_OMNIBOX_KEYBOARD_VIEW_APPEND;
-    appendImage = NativeReversableImage(appendResourceID, YES);
-  }
-  appendImage =
-      [appendImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-  _trailingButton.tintColor =
-      color::DarkModeDynamicColor([UIColor colorNamed:kBlueColor], _incognito,
-                                  [UIColor colorNamed:kBlueDarkColor]);
-
-  [_trailingButton setImage:appendImage forState:UIControlStateNormal];
-}
-
-- (NSString*)accessibilityLabel {
-  return _textTruncatingLabel.attributedText.string;
-}
-
-- (NSString*)accessibilityValue {
-  return _detailTruncatingLabel.hidden
-             ? _detailAnswerLabel.attributedText.string
-             : _detailTruncatingLabel.attributedText.string;
-}
-
-- (BOOL)showsLeadingIcons {
-    return IsRegularXRegularSizeClass();
-}
-
-- (void)accessibilityTrailingButtonTapped {
-  [self.delegate accessibilityTrailingButtonTappedOmniboxPopupRow:self];
-}
-
-@end

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row_cell_unittest.mm

@@ -5,7 +5,6 @@
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row_cell.h"
 
 #import "ios/chrome/browser/ui/omnibox/popup/autocomplete_suggestion.h"
-#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #include "url/gurl.h"

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_controller_unittest.mm

-// Copyright 2018 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/omnibox/popup/omnibox_popup_legacy_view_controller.h"
-
-#include "components/omnibox/browser/autocomplete_match.h"
-#import "ios/chrome/browser/ui/omnibox/popup/autocomplete_match_formatter.h"
-#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_row.h"
-#include "testing/gtest_mac.h"
-#include "testing/platform_test.h"
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-namespace {
-
-class OmniboxPopupViewControllerTest : public PlatformTest {
- protected:
-  void SetUp() override {
-    PlatformTest::SetUp();
-    popup_view_controller_ = [[OmniboxPopupLegacyViewController alloc] init];
-  }
-
-  OmniboxPopupLegacyViewController* popup_view_controller_;
-};
-
-TEST_F(OmniboxPopupViewControllerTest, HasTabMatch) {
-  EXPECT_TRUE([popup_view_controller_
-      conformsToProtocol:@protocol(UITableViewDataSource)]);
-  id<UITableViewDataSource> datasource =
-      (id<UITableViewDataSource>)popup_view_controller_;
-  UITableView* table_view = [[UITableView alloc] init];
-
-  // Check that if the match has a tab match, the cell's trailing button is
-  // visible.
-  AutocompleteMatch match;
-  match.has_tab_match = true;
-  AutocompleteMatchFormatter* formatter =
-      [[AutocompleteMatchFormatter alloc] initWithMatch:match];
-  [popup_view_controller_ updateMatches:@[ formatter ] withAnimation:NO];
-
-  EXPECT_EQ([datasource tableView:table_view numberOfRowsInSection:0], 1);
-  OmniboxPopupRow* cell = static_cast<OmniboxPopupRow*>([datasource
-                  tableView:table_view
-      cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]]);
-
-  EXPECT_FALSE(cell.trailingButton.hidden);
-
-  // Check that it is not the case if the tab match isn't visible.
-  match.has_tab_match = false;
-  formatter = [[AutocompleteMatchFormatter alloc] initWithMatch:match];
-  [popup_view_controller_ updateMatches:@[ formatter ] withAnimation:NO];
-
-  EXPECT_EQ([datasource tableView:table_view numberOfRowsInSection:0], 1);
-  cell = static_cast<OmniboxPopupRow*>([datasource
-                  tableView:table_view
-      cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]]);
-
-  EXPECT_TRUE(cell.trailingButton.hidden);
-}
-
-}  // namespace

ios/chrome/browser/ui/omnibox/popup/omnibox_popup_view_ios.h

@@ -11,7 +11,6 @@
 
 #include "base/strings/string16.h"
 #include "components/omnibox/browser/omnibox_popup_view.h"
-#import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_legacy_view_controller.h"
 #import "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_mediator.h"
 #include "ios/chrome/browser/ui/omnibox/popup/omnibox_popup_provider.h"