OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/chromeos/login/login_screen.h" | 5 #include "chrome/browser/chromeos/login/login_screen.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 } | 95 } |
96 | 96 |
97 void LoginScreen::OnLoginSuccess( | 97 void LoginScreen::OnLoginSuccess( |
98 const std::string& username, | 98 const std::string& username, |
99 const std::string& password, | 99 const std::string& password, |
100 const GaiaAuthConsumer::ClientLoginResult& credentials, | 100 const GaiaAuthConsumer::ClientLoginResult& credentials, |
101 bool pending_requests) { | 101 bool pending_requests) { |
102 | 102 |
103 delegate()->GetObserver(this)->OnExit(ScreenObserver::LOGIN_SIGN_IN_SELECTED); | 103 delegate()->GetObserver(this)->OnExit(ScreenObserver::LOGIN_SIGN_IN_SELECTED); |
104 AppendStartUrlToCmdline(); | 104 AppendStartUrlToCmdline(); |
105 LoginUtils::Get()->CompleteLogin(username, password, credentials); | 105 LoginUtils::Get()->CompleteLogin(username, |
| 106 password, |
| 107 credentials, |
| 108 pending_requests); |
106 } | 109 } |
107 | 110 |
108 void LoginScreen::OnOffTheRecordLoginSuccess() { | 111 void LoginScreen::OnOffTheRecordLoginSuccess() { |
109 LoginUtils::Get()->CompleteOffTheRecordLogin(start_url_); | 112 LoginUtils::Get()->CompleteOffTheRecordLogin(start_url_); |
110 } | 113 } |
111 | 114 |
112 void LoginScreen::OnHelpLinkActivated() { | 115 void LoginScreen::OnHelpLinkActivated() { |
113 AddStartUrl(GetAccountRecoveryHelpUrl()); | 116 AddStartUrl(GetAccountRecoveryHelpUrl()); |
114 OnLoginOffTheRecord(); | 117 OnLoginOffTheRecord(); |
115 } | 118 } |
(...skipping 14 matching lines...) Expand all Loading... |
130 view()->GetWidget(), | 133 view()->GetWidget(), |
131 view()->GetPasswordBounds(), | 134 view()->GetPasswordBounds(), |
132 BubbleBorder::LEFT_TOP, | 135 BubbleBorder::LEFT_TOP, |
133 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING), | 136 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING), |
134 error_text, | 137 error_text, |
135 l10n_util::GetString(IDS_CANT_ACCESS_ACCOUNT_BUTTON), | 138 l10n_util::GetString(IDS_CANT_ACCESS_ACCOUNT_BUTTON), |
136 this); | 139 this); |
137 } | 140 } |
138 | 141 |
139 } // namespace chromeos | 142 } // namespace chromeos |
OLD | NEW |