| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ios/chrome/browser/ui/authentication/chrome_signin_view_controller.h" | 5 #include "ios/chrome/browser/ui/authentication/chrome_signin_view_controller.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 _activityIndicator.reset( | 685 _activityIndicator.reset( |
| 686 [[MDCActivityIndicator alloc] initWithFrame:CGRectZero]); | 686 [[MDCActivityIndicator alloc] initWithFrame:CGRectZero]); |
| 687 [_activityIndicator setDelegate:self]; | 687 [_activityIndicator setDelegate:self]; |
| 688 [_activityIndicator setStrokeWidth:3]; | 688 [_activityIndicator setStrokeWidth:3]; |
| 689 [_activityIndicator | 689 [_activityIndicator |
| 690 setCycleColors:@[ [[MDCPalette cr_bluePalette] tint500] ]]; | 690 setCycleColors:@[ [[MDCPalette cr_bluePalette] tint500] ]]; |
| 691 [self.view addSubview:_activityIndicator]; | 691 [self.view addSubview:_activityIndicator]; |
| 692 | 692 |
| 693 _gradientView.reset([[UIView alloc] initWithFrame:CGRectZero]); | 693 _gradientView.reset([[UIView alloc] initWithFrame:CGRectZero]); |
| 694 _gradientLayer.reset([[CAGradientLayer layer] retain]); | 694 _gradientLayer.reset([[CAGradientLayer layer] retain]); |
| 695 [_gradientView setUserInteractionEnabled:NO]; |
| 695 _gradientLayer.get().colors = [NSArray | 696 _gradientLayer.get().colors = [NSArray |
| 696 arrayWithObjects:(id)[[UIColor colorWithWhite:1 alpha:0] CGColor], | 697 arrayWithObjects:(id)[[UIColor colorWithWhite:1 alpha:0] CGColor], |
| 697 (id)[self.backgroundColor CGColor], nil]; | 698 (id)[self.backgroundColor CGColor], nil]; |
| 698 [[_gradientView layer] insertSublayer:_gradientLayer atIndex:0]; | 699 [[_gradientView layer] insertSublayer:_gradientLayer atIndex:0]; |
| 699 [self.view addSubview:_gradientView]; | 700 [self.view addSubview:_gradientView]; |
| 700 } | 701 } |
| 701 | 702 |
| 702 - (void)viewWillAppear:(BOOL)animated { | 703 - (void)viewWillAppear:(BOOL)animated { |
| 703 [super viewWillAppear:animated]; | 704 [super viewWillAppear:animated]; |
| 704 | 705 |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 942 } | 943 } |
| 943 _hasConfirmationScreenReachedBottom = YES; | 944 _hasConfirmationScreenReachedBottom = YES; |
| 944 [self setPrimaryButtonStyling:_primaryButton]; | 945 [self setPrimaryButtonStyling:_primaryButton]; |
| 945 [_primaryButton setTitle:[self acceptSigninButtonTitle] | 946 [_primaryButton setTitle:[self acceptSigninButtonTitle] |
| 946 forState:UIControlStateNormal]; | 947 forState:UIControlStateNormal]; |
| 947 [_primaryButton setImage:nil forState:UIControlStateNormal]; | 948 [_primaryButton setImage:nil forState:UIControlStateNormal]; |
| 948 [self.view setNeedsLayout]; | 949 [self.view setNeedsLayout]; |
| 949 } | 950 } |
| 950 | 951 |
| 951 @end | 952 @end |
| OLD | NEW |