Commit aa305dca authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Commit Bot

[iOS] Removing calls to IsUIRefreshPhase1Enabled() for Sign in promo

Removing calls to IsUIRefreshPhase1Enabled() for Sign in promo.

Bug: 884724
Change-Id: I8417859a633484a1ff46ac440eacb02558ea661f
Reviewed-on: https://chromium-review.googlesource.com/c/1317859
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605396}
parent 08f4508d
...@@ -59,13 +59,11 @@ source_set("authentication") { ...@@ -59,13 +59,11 @@ source_set("authentication") {
"//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/commands",
"//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/material_components",
"//ios/chrome/browser/ui/signin_interaction/public", "//ios/chrome/browser/ui/signin_interaction/public",
"//ios/chrome/browser/ui/util",
"//ios/chrome/browser/unified_consent", "//ios/chrome/browser/unified_consent",
"//ios/chrome/common", "//ios/chrome/common",
"//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser",
"//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/images",
"//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin",
"//ios/third_party/material_components_ios",
"//services/identity/public/cpp:cpp", "//services/identity/public/cpp:cpp",
"//ui/base", "//ui/base",
"//ui/gfx", "//ui/gfx",
...@@ -170,7 +168,6 @@ source_set("unit_tests") { ...@@ -170,7 +168,6 @@ source_set("unit_tests") {
"//ios/chrome/browser/unified_consent", "//ios/chrome/browser/unified_consent",
"//ios/chrome/test:test_support", "//ios/chrome/test:test_support",
"//ios/public/provider/chrome/browser/signin:test_support", "//ios/public/provider/chrome/browser/signin:test_support",
"//ios/third_party/material_components_ios",
"//ios/web/public/test", "//ios/web/public/test",
"//testing/gtest", "//testing/gtest",
"//third_party/ocmock", "//third_party/ocmock",
......
...@@ -61,9 +61,7 @@ const CGFloat kSignInPromoViewPadding = 10; ...@@ -61,9 +61,7 @@ const CGFloat kSignInPromoViewPadding = 10;
self = [super initWithFrame:frame]; self = [super initWithFrame:frame];
if (self) { if (self) {
UIView* contentView = self.contentView; UIView* contentView = self.contentView;
_signinPromoView = _signinPromoView = [[SigninPromoView alloc] initWithFrame:self.bounds];
[[SigninPromoView alloc] initWithFrame:self.bounds
style:SigninPromoViewUIRefresh];
_signinPromoView.translatesAutoresizingMaskIntoConstraints = NO; _signinPromoView.translatesAutoresizingMaskIntoConstraints = NO;
[contentView addSubview:_signinPromoView]; [contentView addSubview:_signinPromoView];
......
...@@ -9,18 +9,8 @@ ...@@ -9,18 +9,8 @@
#include "components/signin/core/browser/signin_metrics.h" #include "components/signin/core/browser/signin_metrics.h"
@class MDCFlatButton;
@protocol SigninPromoViewDelegate; @protocol SigninPromoViewDelegate;
typedef NS_ENUM(NSInteger, SigninPromoViewUI) {
// The legacy SigninPromoViewUI style.
SigninPromoViewUILegacy,
// The SigninPromoViewRefreshUI style. In order for this value to take effect
// the UIRefreshPhase1 flag also needs to be enabled. Otherwise
// SigninPromoViewUILegacy style will still be used.
SigninPromoViewUIRefresh,
};
typedef NS_ENUM(NSInteger, SigninPromoViewMode) { typedef NS_ENUM(NSInteger, SigninPromoViewMode) {
// No identity available on the device. // No identity available on the device.
SigninPromoViewModeColdState, SigninPromoViewModeColdState,
...@@ -62,12 +52,8 @@ extern NSString* const kSigninPromoCloseButtonId; ...@@ -62,12 +52,8 @@ extern NSString* const kSigninPromoCloseButtonId;
// |textLabel|. // |textLabel|.
@property(nonatomic, readonly) CGFloat horizontalPadding; @property(nonatomic, readonly) CGFloat horizontalPadding;
// Designated initializer. |signinPromoViewUI| sets the style for the // Designated initializer.
// SigninPromoView to legacy or refreshed. This same view is used on Collections
// and Settings, while the Collections UI will be refreshed soon, we still need
// to support the legacy UI for settings.
- (instancetype)initWithFrame:(CGRect)frame - (instancetype)initWithFrame:(CGRect)frame
style:(SigninPromoViewUI)signinPromoViewUI
NS_DESIGNATED_INITIALIZER; NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE; - (instancetype)initWithFrame:(CGRect)frame NS_UNAVAILABLE;
- (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE; - (instancetype)initWithCoder:(NSCoder*)aDecoder NS_UNAVAILABLE;
......
...@@ -17,8 +17,7 @@ using SigninPromoViewTest = PlatformTest; ...@@ -17,8 +17,7 @@ using SigninPromoViewTest = PlatformTest;
TEST_F(SigninPromoViewTest, ChromiumLogoImage) { TEST_F(SigninPromoViewTest, ChromiumLogoImage) {
UIWindow* currentWindow = [[UIApplication sharedApplication] keyWindow]; UIWindow* currentWindow = [[UIApplication sharedApplication] keyWindow];
SigninPromoView* view = SigninPromoView* view =
[[SigninPromoView alloc] initWithFrame:CGRectMake(0, 0, 100, 100) [[SigninPromoView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
style:SigninPromoViewUIRefresh];
view.mode = SigninPromoViewModeColdState; view.mode = SigninPromoViewModeColdState;
[currentWindow.rootViewController.view addSubview:view]; [currentWindow.rootViewController.view addSubview:view];
UIImage* chromiumLogo = view.imageView.image; UIImage* chromiumLogo = view.imageView.image;
...@@ -37,8 +36,7 @@ TEST_F(SigninPromoViewTest, ChromiumLogoImage) { ...@@ -37,8 +36,7 @@ TEST_F(SigninPromoViewTest, ChromiumLogoImage) {
TEST_F(SigninPromoViewTest, SecondaryButtonVisibility) { TEST_F(SigninPromoViewTest, SecondaryButtonVisibility) {
UIWindow* currentWindow = [[UIApplication sharedApplication] keyWindow]; UIWindow* currentWindow = [[UIApplication sharedApplication] keyWindow];
SigninPromoView* view = SigninPromoView* view =
[[SigninPromoView alloc] initWithFrame:CGRectMake(0, 0, 100, 100) [[SigninPromoView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
style:SigninPromoViewUIRefresh];
view.mode = SigninPromoViewModeColdState; view.mode = SigninPromoViewModeColdState;
[currentWindow.rootViewController.view addSubview:view]; [currentWindow.rootViewController.view addSubview:view];
EXPECT_TRUE(view.secondaryButton.hidden); EXPECT_TRUE(view.secondaryButton.hidden);
......
...@@ -35,9 +35,7 @@ const NSInteger kSigninPromoMargin = 8; ...@@ -35,9 +35,7 @@ const NSInteger kSigninPromoMargin = 8;
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
if (self) { if (self) {
UIView* contentView = self.contentView; UIView* contentView = self.contentView;
_signinPromoView = _signinPromoView = [[SigninPromoView alloc] initWithFrame:self.bounds];
[[SigninPromoView alloc] initWithFrame:self.bounds
style:SigninPromoViewUIRefresh];
_signinPromoView.translatesAutoresizingMaskIntoConstraints = NO; _signinPromoView.translatesAutoresizingMaskIntoConstraints = NO;
[contentView addSubview:_signinPromoView]; [contentView addSubview:_signinPromoView];
NSArray* visualConstraints = @[ NSArray* visualConstraints = @[
......
...@@ -58,8 +58,7 @@ const CGFloat kMargin = 16; ...@@ -58,8 +58,7 @@ const CGFloat kMargin = 16;
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
if (self) { if (self) {
SigninPromoView* signinPromoView = SigninPromoView* signinPromoView =
[[SigninPromoView alloc] initWithFrame:CGRectZero [[SigninPromoView alloc] initWithFrame:CGRectZero];
style:SigninPromoViewUIRefresh];
self.signinPromoView = signinPromoView; self.signinPromoView = signinPromoView;
self.signinPromoView.translatesAutoresizingMaskIntoConstraints = NO; self.signinPromoView.translatesAutoresizingMaskIntoConstraints = NO;
[self.contentView addSubview:self.signinPromoView]; [self.contentView addSubview:self.signinPromoView];
......
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