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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 4980005: Allow sync with 2-factor StrongAuth accounts in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 10 years, 1 month 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 | Annotate | Revision Log
OLDNEW
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 874 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 explicit StubLogin(std::string username, std::string password) { 885 explicit StubLogin(std::string username, std::string password) {
886 authenticator_ = chromeos::LoginUtils::Get()->CreateAuthenticator(this); 886 authenticator_ = chromeos::LoginUtils::Get()->CreateAuthenticator(this);
887 authenticator_.get()->AuthenticateToLogin( 887 authenticator_.get()->AuthenticateToLogin(
888 g_browser_process->profile_manager()->GetDefaultProfile(), 888 g_browser_process->profile_manager()->GetDefaultProfile(),
889 username, 889 username,
890 password, 890 password,
891 std::string(), 891 std::string(),
892 std::string()); 892 std::string());
893 } 893 }
894 894
895 void SetLoginFailure(const chromeos::LoginFailure& error) {}
896
895 void OnLoginFailure(const chromeos::LoginFailure& error) { 897 void OnLoginFailure(const chromeos::LoginFailure& error) {
896 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); 898 LOG(ERROR) << "Login Failure: " << error.GetErrorString();
897 delete this; 899 delete this;
898 } 900 }
899 901
900 void OnLoginSuccess(const std::string& username, 902 void OnLoginSuccess(const std::string& username,
901 const std::string& password, 903 const std::string& password,
902 const GaiaAuthConsumer::ClientLoginResult& credentials, 904 const GaiaAuthConsumer::ClientLoginResult& credentials,
903 bool pending_requests) { 905 bool pending_requests) {
904 chromeos::LoginUtils::Get()->CompleteLogin(username, password, credentials); 906 chromeos::LoginUtils::Get()->CompleteLogin(username, password, credentials);
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
1663 metrics->Stop(); 1665 metrics->Stop();
1664 1666
1665 // browser_shutdown takes care of deleting browser_process, so we need to 1667 // browser_shutdown takes care of deleting browser_process, so we need to
1666 // release it. 1668 // release it.
1667 ignore_result(browser_process.release()); 1669 ignore_result(browser_process.release());
1668 browser_shutdown::Shutdown(); 1670 browser_shutdown::Shutdown();
1669 1671
1670 TRACE_EVENT_END("BrowserMain", 0, 0); 1672 TRACE_EVENT_END("BrowserMain", 0, 0);
1671 return result_code; 1673 return result_code;
1672 } 1674 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_signin.cc » ('j') | chrome/browser/chromeos/login/login_status_consumer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698