Index: chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm |
diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm |
index 28f087396fb53fd81805cfb94c8b44b9e24a5938..5a7480fb00c3eca1cdfc51841a16d7f6b96e6398 100644 |
--- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm |
+++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm |
@@ -142,16 +142,14 @@ |
@implementation ProfileSigninConfirmationViewController |
- (id)initWithBrowser:(Browser*)browser |
- username:(const std::string&)username |
- delegate: |
- (std::unique_ptr<ui::ProfileSigninConfirmationDelegate>) |
- delegate |
- closeDialogCallback:(const base::Closure&)closeDialogCallback |
- offerProfileCreation:(bool)offer { |
+ username:(const std::string&)username |
+ delegate:(ui::ProfileSigninConfirmationDelegate*)delegate |
+ closeDialogCallback:(const base::Closure&)closeDialogCallback |
+ offerProfileCreation:(bool)offer { |
if ((self = [super initWithNibName:nil bundle:nil])) { |
browser_ = browser; |
username_ = username; |
- delegate_ = std::move(delegate); |
+ delegate_ = delegate; |
closeDialogCallback_ = closeDialogCallback; |
offerProfileCreation_ = offer; |
} |
@@ -378,7 +376,7 @@ |
- (IBAction)cancel:(id)sender { |
if (delegate_) { |
delegate_->OnCancelSignin(); |
- delegate_ = nullptr; |
+ delegate_ = NULL; |
closeDialogCallback_.Run(); |
} |
} |
@@ -386,7 +384,7 @@ |
- (IBAction)ok:(id)sender { |
if (delegate_) { |
delegate_->OnContinueSignin(); |
- delegate_ = nullptr; |
+ delegate_ = NULL; |
closeDialogCallback_.Run(); |
} |
} |
@@ -394,7 +392,7 @@ |
- (IBAction)close:(id)sender { |
if (delegate_) { |
delegate_->OnCancelSignin(); |
- delegate_ = nullptr; |
+ delegate_ = NULL; |
} |
closeDialogCallback_.Run(); |
} |
@@ -402,7 +400,7 @@ |
- (IBAction)createProfile:(id)sender { |
if (delegate_) { |
delegate_->OnSigninWithNewProfile(); |
- delegate_ = nullptr; |
+ delegate_ = NULL; |
closeDialogCallback_.Run(); |
} |
} |
@@ -442,3 +440,19 @@ |
} |
@end |
+ |
+@implementation ProfileSigninConfirmationViewController (TestingAPI) |
+ |
+- (ui::ProfileSigninConfirmationDelegate*)delegate { |
+ return delegate_; |
+} |
+ |
+- (NSButton*)createProfileButton { |
+ return createProfileButton_.get(); |
+} |
+ |
+- (NSTextView*)explanationField { |
+ return explanationField_.get(); |
+} |
+ |
+@end |