OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 public LoginUtils::Delegate { | 153 public LoginUtils::Delegate { |
154 public: | 154 public: |
155 StubLogin(std::string username, std::string password) | 155 StubLogin(std::string username, std::string password) |
156 : pending_requests_(false), | 156 : pending_requests_(false), |
157 profile_prepared_(false) { | 157 profile_prepared_(false) { |
158 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this); | 158 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this); |
159 authenticator_.get()->AuthenticateToLogin( | 159 authenticator_.get()->AuthenticateToLogin( |
160 g_browser_process->profile_manager()->GetDefaultProfile(), | 160 g_browser_process->profile_manager()->GetDefaultProfile(), |
161 UserContext(username, | 161 UserContext(username, |
162 password, | 162 password, |
163 std::string()), // auth_code | 163 std::string())); // auth_code |
164 std::string(), // login_token | |
165 std::string()); // login_captcha | |
166 } | 164 } |
167 | 165 |
168 virtual ~StubLogin() { | 166 virtual ~StubLogin() { |
169 LoginUtils::Get()->DelegateDeleted(this); | 167 LoginUtils::Get()->DelegateDeleted(this); |
170 } | 168 } |
171 | 169 |
172 virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE { | 170 virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE { |
173 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); | 171 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); |
174 delete this; | 172 delete this; |
175 } | 173 } |
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
847 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 845 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
848 // Destroy DeviceSettingsService after g_browser_process. | 846 // Destroy DeviceSettingsService after g_browser_process. |
849 DeviceSettingsService::Shutdown(); | 847 DeviceSettingsService::Shutdown(); |
850 } | 848 } |
851 | 849 |
852 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { | 850 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { |
853 default_pinned_apps_field_trial::SetupTrial(); | 851 default_pinned_apps_field_trial::SetupTrial(); |
854 } | 852 } |
855 | 853 |
856 } // namespace chromeos | 854 } // namespace chromeos |
OLD | NEW |