Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4246)

Unified Diff: chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm

Issue 2625813003: MacViews: Allow the toolkit-views Enterprise Signin Confirmation Dialog to be used (Closed)
Patch Set: Rebase (DID NOT LAND) Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5a7480fb00c3eca1cdfc51841a16d7f6b96e6398..28f087396fb53fd81805cfb94c8b44b9e24a5938 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,14 +142,16 @@ NSTextField* AddTextField(
@implementation ProfileSigninConfirmationViewController
- (id)initWithBrowser:(Browser*)browser
- username:(const std::string&)username
- delegate:(ui::ProfileSigninConfirmationDelegate*)delegate
- closeDialogCallback:(const base::Closure&)closeDialogCallback
- offerProfileCreation:(bool)offer {
+ username:(const std::string&)username
+ delegate:
+ (std::unique_ptr<ui::ProfileSigninConfirmationDelegate>)
+ delegate
+ closeDialogCallback:(const base::Closure&)closeDialogCallback
+ offerProfileCreation:(bool)offer {
if ((self = [super initWithNibName:nil bundle:nil])) {
browser_ = browser;
username_ = username;
- delegate_ = delegate;
+ delegate_ = std::move(delegate);
closeDialogCallback_ = closeDialogCallback;
offerProfileCreation_ = offer;
}
@@ -376,7 +378,7 @@ NSTextField* AddTextField(
- (IBAction)cancel:(id)sender {
if (delegate_) {
delegate_->OnCancelSignin();
- delegate_ = NULL;
+ delegate_ = nullptr;
closeDialogCallback_.Run();
}
}
@@ -384,7 +386,7 @@ NSTextField* AddTextField(
- (IBAction)ok:(id)sender {
if (delegate_) {
delegate_->OnContinueSignin();
- delegate_ = NULL;
+ delegate_ = nullptr;
closeDialogCallback_.Run();
}
}
@@ -392,7 +394,7 @@ NSTextField* AddTextField(
- (IBAction)close:(id)sender {
if (delegate_) {
delegate_->OnCancelSignin();
- delegate_ = NULL;
+ delegate_ = nullptr;
}
closeDialogCallback_.Run();
}
@@ -400,7 +402,7 @@ NSTextField* AddTextField(
- (IBAction)createProfile:(id)sender {
if (delegate_) {
delegate_->OnSigninWithNewProfile();
- delegate_ = NULL;
+ delegate_ = nullptr;
closeDialogCallback_.Run();
}
}
@@ -440,19 +442,3 @@ NSTextField* AddTextField(
}
@end
-
-@implementation ProfileSigninConfirmationViewController (TestingAPI)
-
-- (ui::ProfileSigninConfirmationDelegate*)delegate {
- return delegate_;
-}
-
-- (NSButton*)createProfileButton {
- return createProfileButton_.get();
-}
-
-- (NSTextView*)explanationField {
- return explanationField_.get();
-}
-
-@end

Powered by Google App Engine
This is Rietveld 408576698