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

Side by Side Diff: chrome/browser/ui/signin_view_controller.cc

Issue 2348423002: [Signin Error Dialog] (3/3) Added the triggering code (Closed)
Patch Set: Fix malformed function declaration on mac. Created 4 years, 2 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 unified diff | Download patch
OLDNEW
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/signin_view_controller_delegate.h" 7 #include "chrome/browser/ui/signin_view_controller_delegate.h"
8 #include "components/signin/core/common/profile_management_switches.h" 8 #include "components/signin/core/common/profile_management_switches.h"
9 9
10 SigninViewController::SigninViewController() 10 SigninViewController::SigninViewController()
(...skipping 17 matching lines...) Expand all
28 28
29 void SigninViewController::ShowModalSyncConfirmationDialog(Browser* browser) { 29 void SigninViewController::ShowModalSyncConfirmationDialog(Browser* browser) {
30 CloseModalSignin(); 30 CloseModalSignin();
31 // The delegate will delete itself on request of the UI code when the widget 31 // The delegate will delete itself on request of the UI code when the widget
32 // is closed. 32 // is closed.
33 signin_view_controller_delegate_ = 33 signin_view_controller_delegate_ =
34 SigninViewControllerDelegate::CreateSyncConfirmationDelegate(this, 34 SigninViewControllerDelegate::CreateSyncConfirmationDelegate(this,
35 browser); 35 browser);
36 } 36 }
37 37
38 void SigninViewController::ShowModalSigninErrorDialog(Browser* browser) {
39 CloseModalSignin();
40 // The delegate will delete itself on request of the UI code when the widget
41 // is closed.
42 signin_view_controller_delegate_ =
43 SigninViewControllerDelegate::CreateSigninErrorDelegate(this, browser);
44 }
45
38 void SigninViewController::CloseModalSignin() { 46 void SigninViewController::CloseModalSignin() {
39 if (signin_view_controller_delegate_) 47 if (signin_view_controller_delegate_)
40 signin_view_controller_delegate_->CloseModalSignin(); 48 signin_view_controller_delegate_->CloseModalSignin();
41 49
42 DCHECK(!signin_view_controller_delegate_); 50 DCHECK(!signin_view_controller_delegate_);
43 } 51 }
44 52
45 void SigninViewController::SetModalSigninHeight(int height) { 53 void SigninViewController::SetModalSigninHeight(int height) {
46 if (signin_view_controller_delegate_) 54 if (signin_view_controller_delegate_)
47 signin_view_controller_delegate_->ResizeNativeView(height); 55 signin_view_controller_delegate_->ResizeNativeView(height);
48 } 56 }
49 57
50 void SigninViewController::ResetModalSigninDelegate() { 58 void SigninViewController::ResetModalSigninDelegate() {
51 signin_view_controller_delegate_ = nullptr; 59 signin_view_controller_delegate_ = nullptr;
52 } 60 }
53 61
54 // static 62 // static
55 bool SigninViewController::ShouldShowModalSigninForMode( 63 bool SigninViewController::ShouldShowModalSigninForMode(
56 profiles::BubbleViewMode mode) { 64 profiles::BubbleViewMode mode) {
57 return switches::UsePasswordSeparatedSigninFlow() && 65 return switches::UsePasswordSeparatedSigninFlow() &&
58 (mode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN || 66 (mode == profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN ||
59 mode == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT || 67 mode == profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT ||
60 mode == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH); 68 mode == profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH);
61 } 69 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/signin_view_controller.h ('k') | chrome/browser/ui/signin_view_controller_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698