Commit 0363f71c authored by stkhapugin@chromium.org's avatar stkhapugin@chromium.org Committed by Commit Bot

Rename FaviconViewNew to FaviconView.

Since FaviconView name is not used anymore, it makes sense now.

Bug: none
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I0549111a1ade2f8cc61664d1de07160c8687b6de
Reviewed-on: https://chromium-review.googlesource.com/c/1278807Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599175}
parent f097036d
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h" #import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
@class FaviconViewNew; @class FaviconView;
// Corresponding cell for an article in the suggestions. // Corresponding cell for an article in the suggestions.
@interface ContentSuggestionsCell : MDCCollectionViewCell @interface ContentSuggestionsCell : MDCCollectionViewCell
@property(nonatomic, readonly, strong) UILabel* titleLabel; @property(nonatomic, readonly, strong) UILabel* titleLabel;
// View for displaying the favicon. // View for displaying the favicon.
@property(nonatomic, readonly, strong) FaviconViewNew* faviconView; @property(nonatomic, readonly, strong) FaviconView* faviconView;
// Whether the image should be displayed. // Whether the image should be displayed.
@property(nonatomic, assign) BOOL displayImage; @property(nonatomic, assign) BOOL displayImage;
......
...@@ -90,7 +90,7 @@ const CGFloat kAnimationDuration = 0.3; ...@@ -90,7 +90,7 @@ const CGFloat kAnimationDuration = 0.3;
_noImageIcon = [[UIImageView alloc] initWithFrame:CGRectZero]; _noImageIcon = [[UIImageView alloc] initWithFrame:CGRectZero];
_additionalInformationLabel = [[UILabel alloc] initWithFrame:CGRectZero]; _additionalInformationLabel = [[UILabel alloc] initWithFrame:CGRectZero];
_contentImageView = [[UIImageView alloc] initWithFrame:CGRectZero]; _contentImageView = [[UIImageView alloc] initWithFrame:CGRectZero];
_faviconView = [[FaviconViewNew alloc] init]; _faviconView = [[FaviconView alloc] init];
_contentImageView.contentMode = UIViewContentModeScaleAspectFill; _contentImageView.contentMode = UIViewContentModeScaleAspectFill;
_contentImageView.clipsToBounds = YES; _contentImageView.clipsToBounds = YES;
......
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h" #import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
@class FaviconViewNew; @class FaviconView;
// Associated cell to display a Most Visited tile based on the suggestion. // Associated cell to display a Most Visited tile based on the suggestion.
// It displays the favicon for this Most Visited suggestion and its title. // It displays the favicon for this Most Visited suggestion and its title.
@interface ContentSuggestionsMostVisitedCell : MDCCollectionViewCell @interface ContentSuggestionsMostVisitedCell : MDCCollectionViewCell
// FaviconView displaying the favicon. // FaviconView displaying the favicon.
@property(nonatomic, strong, readonly, nonnull) FaviconViewNew* faviconView; @property(nonatomic, strong, readonly, nonnull) FaviconView* faviconView;
// Title of the Most Visited. // Title of the Most Visited.
@property(nonatomic, strong, readonly, nonnull) UILabel* titleLabel; @property(nonatomic, strong, readonly, nonnull) UILabel* titleLabel;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
_titleLabel.preferredMaxLayoutWidth = [[self class] defaultSize].width; _titleLabel.preferredMaxLayoutWidth = [[self class] defaultSize].width;
_titleLabel.numberOfLines = kLabelNumLines; _titleLabel.numberOfLines = kLabelNumLines;
_faviconView = [[FaviconViewNew alloc] init]; _faviconView = [[FaviconView alloc] init];
_faviconView.font = [UIFont systemFontOfSize:22]; _faviconView.font = [UIFont systemFontOfSize:22];
_titleLabel.translatesAutoresizingMaskIntoConstraints = NO; _titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
_faviconView.translatesAutoresizingMaskIntoConstraints = NO; _faviconView.translatesAutoresizingMaskIntoConstraints = NO;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#import "ios/chrome/browser/ui/table_view/cells/table_view_item.h" #import "ios/chrome/browser/ui/table_view/cells/table_view_item.h"
class GURL; class GURL;
@class FaviconViewNew; @class FaviconView;
@class TableViewURLCellFaviconBadgeView; @class TableViewURLCellFaviconBadgeView;
// TableViewURLItem contains the model data for a TableViewURLCell. // TableViewURLItem contains the model data for a TableViewURLCell.
...@@ -41,7 +41,7 @@ class GURL; ...@@ -41,7 +41,7 @@ class GURL;
// The imageview that is displayed on the leading edge of the cell. This // The imageview that is displayed on the leading edge of the cell. This
// contains a favicon composited on top of an off-white background. // contains a favicon composited on top of an off-white background.
@property(nonatomic, readonly, strong) FaviconViewNew* faviconView; @property(nonatomic, readonly, strong) FaviconView* faviconView;
// Container View for the faviconView. // Container View for the faviconView.
@property(nonatomic, readonly, strong) UIImageView* faviconContainerView; @property(nonatomic, readonly, strong) UIImageView* faviconContainerView;
......
...@@ -152,7 +152,7 @@ const char kDefaultSupplementalURLTextDelimiter[] = "•"; ...@@ -152,7 +152,7 @@ const char kDefaultSupplementalURLTextDelimiter[] = "•";
_faviconContainerView = [[UIImageView alloc] _faviconContainerView = [[UIImageView alloc]
initWithImage:[UIImage initWithImage:[UIImage
imageNamed:@"table_view_cell_favicon_background"]]; imageNamed:@"table_view_cell_favicon_background"]];
_faviconView = [[FaviconViewNew alloc] init]; _faviconView = [[FaviconView alloc] init];
_faviconView.contentMode = UIViewContentModeScaleAspectFit; _faviconView.contentMode = UIViewContentModeScaleAspectFit;
_faviconView.clipsToBounds = YES; _faviconView.clipsToBounds = YES;
[_faviconContainerView addSubview:_faviconView]; [_faviconContainerView addSubview:_faviconView];
......
...@@ -16,7 +16,7 @@ const CGFloat kFaviconMinSize = 16.0f; ...@@ -16,7 +16,7 @@ const CGFloat kFaviconMinSize = 16.0f;
const CGFloat kFaviconPreferredSize = 24.0f; const CGFloat kFaviconPreferredSize = 24.0f;
} // namespace } // namespace
@interface FaviconViewNew : UIView @interface FaviconView : UIView
// Configures this view with given attributes. // Configures this view with given attributes.
- (void)configureWithAttributes:(nullable FaviconAttributes*)attributes; - (void)configureWithAttributes:(nullable FaviconAttributes*)attributes;
......
...@@ -15,8 +15,8 @@ namespace { ...@@ -15,8 +15,8 @@ namespace {
const CGFloat kDefaultCornerRadius = 3; const CGFloat kDefaultCornerRadius = 3;
} }
@interface FaviconViewNew () { @interface FaviconView () {
// Property releaser for FaviconViewNew. // Property releaser for FaviconView.
} }
// Image view for the favicon. // Image view for the favicon.
...@@ -26,7 +26,7 @@ const CGFloat kDefaultCornerRadius = 3; ...@@ -26,7 +26,7 @@ const CGFloat kDefaultCornerRadius = 3;
@end @end
@implementation FaviconViewNew @implementation FaviconView
@synthesize faviconImageView = _faviconImageView; @synthesize faviconImageView = _faviconImageView;
@synthesize faviconFallbackLabel = _faviconFallbackLabel; @synthesize faviconFallbackLabel = _faviconFallbackLabel;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#import "ios/chrome/common/highlight_button.h" #import "ios/chrome/common/highlight_button.h"
@class FaviconViewNew; @class FaviconView;
// View to display a Most Visited tile based on the suggestion. // View to display a Most Visited tile based on the suggestion.
// It displays the favicon for this Most Visited suggestion and its title. // It displays the favicon for this Most Visited suggestion and its title.
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
- (nonnull instancetype)initWithCoder:(nonnull NSCoder*)aDecoder NS_UNAVAILABLE; - (nonnull instancetype)initWithCoder:(nonnull NSCoder*)aDecoder NS_UNAVAILABLE;
// FaviconView displaying the favicon. // FaviconView displaying the favicon.
@property(nonatomic, strong, readonly, nonnull) FaviconViewNew* faviconView; @property(nonatomic, strong, readonly, nonnull) FaviconView* faviconView;
// Title of the Most Visited. // Title of the Most Visited.
@property(nonatomic, strong, readonly, nonnull) UILabel* titleLabel; @property(nonatomic, strong, readonly, nonnull) UILabel* titleLabel;
......
...@@ -56,7 +56,7 @@ const CGFloat kTileWidth = 73; ...@@ -56,7 +56,7 @@ const CGFloat kTileWidth = 73;
[titleLabelEffectView.contentView addSubview:_titleLabel]; [titleLabelEffectView.contentView addSubview:_titleLabel];
AddSameConstraints(titleLabelEffectView, _titleLabel); AddSameConstraints(titleLabelEffectView, _titleLabel);
_faviconView = [[FaviconViewNew alloc] init]; _faviconView = [[FaviconView alloc] init];
_faviconView.isAccessibilityElement = NO; _faviconView.isAccessibilityElement = NO;
_faviconView.font = _faviconView.font =
[UIFont preferredFontForTextStyle:UIFontTextStyleHeadline]; [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment