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/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 | 925 |
926 void OnLoginFailure(const chromeos::LoginFailure& error) { | 926 void OnLoginFailure(const chromeos::LoginFailure& error) { |
927 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); | 927 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); |
928 delete this; | 928 delete this; |
929 } | 929 } |
930 | 930 |
931 void OnLoginSuccess(const std::string& username, | 931 void OnLoginSuccess(const std::string& username, |
932 const std::string& password, | 932 const std::string& password, |
933 const GaiaAuthConsumer::ClientLoginResult& credentials, | 933 const GaiaAuthConsumer::ClientLoginResult& credentials, |
934 bool pending_requests) { | 934 bool pending_requests) { |
935 chromeos::LoginUtils::Get()->CompleteLogin(username, password, credentials); | 935 chromeos::LoginUtils::Get()->CompleteLogin(username, |
| 936 password, |
| 937 credentials, |
| 938 pending_requests); |
936 delete this; | 939 delete this; |
937 } | 940 } |
938 | 941 |
939 scoped_refptr<chromeos::Authenticator> authenticator_; | 942 scoped_refptr<chromeos::Authenticator> authenticator_; |
940 }; | 943 }; |
941 | 944 |
942 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) { | 945 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) { |
943 if (parsed_command_line.HasSwitch(switches::kLoginManager)) { | 946 if (parsed_command_line.HasSwitch(switches::kLoginManager)) { |
944 std::string first_screen = | 947 std::string first_screen = |
945 parsed_command_line.GetSwitchValueASCII(switches::kLoginScreen); | 948 parsed_command_line.GetSwitchValueASCII(switches::kLoginScreen); |
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1717 #if defined(OS_CHROMEOS) | 1720 #if defined(OS_CHROMEOS) |
1718 // To be precise, logout (browser shutdown) is not yet done, but the | 1721 // To be precise, logout (browser shutdown) is not yet done, but the |
1719 // remaining work is negligible, hence we say LogoutDone here. | 1722 // remaining work is negligible, hence we say LogoutDone here. |
1720 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1723 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
1721 false); | 1724 false); |
1722 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1725 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
1723 #endif | 1726 #endif |
1724 TRACE_EVENT_END("BrowserMain", 0, 0); | 1727 TRACE_EVENT_END("BrowserMain", 0, 0); |
1725 return result_code; | 1728 return result_code; |
1726 } | 1729 } |
OLD | NEW |