| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chrome/browser/ui/signin_view_controller.h" | 5 #include "chrome/browser/ui/signin_view_controller.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/browser_dialogs.h" |
| 7 #include "chrome/browser/ui/signin_view_controller_delegate.h" | 8 #include "chrome/browser/ui/signin_view_controller_delegate.h" |
| 8 #include "components/signin/core/common/profile_management_switches.h" | 9 #include "components/signin/core/common/profile_management_switches.h" |
| 9 | 10 |
| 10 SigninViewController::SigninViewController() | 11 SigninViewController::SigninViewController() |
| 11 : signin_view_controller_delegate_(nullptr) {} | 12 : signin_view_controller_delegate_(nullptr) {} |
| 12 | 13 |
| 13 SigninViewController::~SigninViewController() { | 14 SigninViewController::~SigninViewController() { |
| 14 CloseModalSignin(); | 15 CloseModalSignin(); |
| 15 } | 16 } |
| 16 | 17 |
| 17 void SigninViewController::ShowModalSignin( | 18 void SigninViewController::ShowModalSignin( |
| 18 profiles::BubbleViewMode mode, | 19 profiles::BubbleViewMode mode, |
| 19 Browser* browser, | 20 Browser* browser, |
| 20 signin_metrics::AccessPoint access_point) { | 21 signin_metrics::AccessPoint access_point) { |
| 21 CloseModalSignin(); | 22 CloseModalSignin(); |
| 22 // The delegate will delete itself on request of the UI code when the widget | 23 // The delegate will delete itself on request of the UI code when the widget |
| 23 // is closed. | 24 // is closed. |
| 24 signin_view_controller_delegate_ = | 25 signin_view_controller_delegate_ = |
| 25 SigninViewControllerDelegate::CreateModalSigninDelegate( | 26 SigninViewControllerDelegate::CreateModalSigninDelegate( |
| 26 this, mode, browser, access_point); | 27 this, mode, browser, access_point); |
| 28 chrome::RecordDialogCreation(chrome::DialogIdentifier::SIGN_IN); |
| 27 } | 29 } |
| 28 | 30 |
| 29 void SigninViewController::ShowModalSyncConfirmationDialog(Browser* browser) { | 31 void SigninViewController::ShowModalSyncConfirmationDialog(Browser* browser) { |
| 30 CloseModalSignin(); | 32 CloseModalSignin(); |
| 31 // The delegate will delete itself on request of the UI code when the widget | 33 // The delegate will delete itself on request of the UI code when the widget |
| 32 // is closed. | 34 // is closed. |
| 33 signin_view_controller_delegate_ = | 35 signin_view_controller_delegate_ = |
| 34 SigninViewControllerDelegate::CreateSyncConfirmationDelegate(this, | 36 SigninViewControllerDelegate::CreateSyncConfirmationDelegate(this, |
| 35 browser); | 37 browser); |
| 38 chrome::RecordDialogCreation( |
| 39 chrome::DialogIdentifier::SIGN_IN_SYNC_CONFIRMATION); |
| 36 } | 40 } |
| 37 | 41 |
| 38 void SigninViewController::ShowModalSigninErrorDialog(Browser* browser) { | 42 void SigninViewController::ShowModalSigninErrorDialog(Browser* browser) { |
| 39 CloseModalSignin(); | 43 CloseModalSignin(); |
| 40 // The delegate will delete itself on request of the UI code when the widget | 44 // The delegate will delete itself on request of the UI code when the widget |
| 41 // is closed. | 45 // is closed. |
| 42 signin_view_controller_delegate_ = | 46 signin_view_controller_delegate_ = |
| 43 SigninViewControllerDelegate::CreateSigninErrorDelegate(this, browser); | 47 SigninViewControllerDelegate::CreateSigninErrorDelegate(this, browser); |
| 48 chrome::RecordDialogCreation(chrome::DialogIdentifier::SIGN_IN_ERROR); |
| 44 } | 49 } |
| 45 | 50 |
| 46 void SigninViewController::CloseModalSignin() { | 51 void SigninViewController::CloseModalSignin() { |
| 47 if (signin_view_controller_delegate_) | 52 if (signin_view_controller_delegate_) |
| 48 signin_view_controller_delegate_->CloseModalSignin(); | 53 signin_view_controller_delegate_->CloseModalSignin(); |
| 49 | 54 |
| 50 DCHECK(!signin_view_controller_delegate_); | 55 DCHECK(!signin_view_controller_delegate_); |
| 51 } | 56 } |
| 52 | 57 |
| 53 void SigninViewController::SetModalSigninHeight(int height) { | 58 void SigninViewController::SetModalSigninHeight(int height) { |
| 54 if (signin_view_controller_delegate_) | 59 if (signin_view_controller_delegate_) |
| 55 signin_view_controller_delegate_->ResizeNativeView(height); | 60 signin_view_controller_delegate_->ResizeNativeView(height); |
| 56 } | 61 } |
| 57 | 62 |
| 58 void SigninViewController::ResetModalSigninDelegate() { | 63 void SigninViewController::ResetModalSigninDelegate() { |
| 59 signin_view_controller_delegate_ = nullptr; | 64 signin_view_controller_delegate_ = nullptr; |
| 60 } | 65 } |
| 61 | 66 |
| 62 // static | 67 // static |
| 63 bool SigninViewController::ShouldShowModalSigninForMode( | 68 bool SigninViewController::ShouldShowModalSigninForMode( |
| 64 profiles::BubbleViewMode mode) { | 69 profiles::BubbleViewMode mode) { |
| 65 return switches::UsePasswordSeparatedSigninFlow() && | 70 return switches::UsePasswordSeparatedSigninFlow() && |
| 66 (mode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN || | 71 (mode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN || |
| 67 mode == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT || | 72 mode == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT || |
| 68 mode == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH); | 73 mode == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH); |
| 69 } | 74 } |
| OLD | NEW |