| 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 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 905 | 905 |
| 906 void OnLoginFailure(const chromeos::LoginFailure& error) { | 906 void OnLoginFailure(const chromeos::LoginFailure& error) { |
| 907 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); | 907 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); |
| 908 delete this; | 908 delete this; |
| 909 } | 909 } |
| 910 | 910 |
| 911 void OnLoginSuccess(const std::string& username, | 911 void OnLoginSuccess(const std::string& username, |
| 912 const std::string& password, | 912 const std::string& password, |
| 913 const GaiaAuthConsumer::ClientLoginResult& credentials, | 913 const GaiaAuthConsumer::ClientLoginResult& credentials, |
| 914 bool pending_requests) { | 914 bool pending_requests) { |
| 915 chromeos::LoginUtils::Get()->CompleteLogin(username, password, credentials); | 915 chromeos::LoginUtils::Get()->CompleteLogin(username, |
| 916 password, |
| 917 credentials, |
| 918 pending_requests); |
| 916 delete this; | 919 delete this; |
| 917 } | 920 } |
| 918 | 921 |
| 919 scoped_refptr<chromeos::Authenticator> authenticator_; | 922 scoped_refptr<chromeos::Authenticator> authenticator_; |
| 920 }; | 923 }; |
| 921 | 924 |
| 922 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) { | 925 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) { |
| 923 if (parsed_command_line.HasSwitch(switches::kLoginManager)) { | 926 if (parsed_command_line.HasSwitch(switches::kLoginManager)) { |
| 924 std::string first_screen = | 927 std::string first_screen = |
| 925 parsed_command_line.GetSwitchValueASCII(switches::kLoginScreen); | 928 parsed_command_line.GetSwitchValueASCII(switches::kLoginScreen); |
| (...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1696 #if defined(OS_CHROMEOS) | 1699 #if defined(OS_CHROMEOS) |
| 1697 // To be precise, logout (browser shutdown) is not yet done, but the | 1700 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1698 // remaining work is negligible, hence we say LogoutDone here. | 1701 // remaining work is negligible, hence we say LogoutDone here. |
| 1699 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1702 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1700 false); | 1703 false); |
| 1701 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1704 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1702 #endif | 1705 #endif |
| 1703 TRACE_EVENT_END("BrowserMain", 0, 0); | 1706 TRACE_EVENT_END("BrowserMain", 0, 0); |
| 1704 return result_code; | 1707 return result_code; |
| 1705 } | 1708 } |
| OLD | NEW |