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 26 matching lines...) Expand all Loading... |
37 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h" | 37 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h" |
38 #include "chrome/browser/chromeos/external_metrics.h" | 38 #include "chrome/browser/chromeos/external_metrics.h" |
39 #include "chrome/browser/chromeos/imageburner/burn_manager.h" | 39 #include "chrome/browser/chromeos/imageburner/burn_manager.h" |
40 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 40 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
41 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 41 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" | 42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" |
43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | 43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
45 #include "chrome/browser/chromeos/language_preferences.h" | 45 #include "chrome/browser/chromeos/language_preferences.h" |
46 #include "chrome/browser/chromeos/login/auth/authenticator.h" | 46 #include "chrome/browser/chromeos/login/auth/authenticator.h" |
| 47 #include "chrome/browser/chromeos/login/auth/key.h" |
47 #include "chrome/browser/chromeos/login/auth/user_context.h" | 48 #include "chrome/browser/chromeos/login/auth/user_context.h" |
48 #include "chrome/browser/chromeos/login/helper.h" | 49 #include "chrome/browser/chromeos/login/helper.h" |
49 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 50 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
50 #include "chrome/browser/chromeos/login/login_utils.h" | 51 #include "chrome/browser/chromeos/login/login_utils.h" |
51 #include "chrome/browser/chromeos/login/login_wizard.h" | 52 #include "chrome/browser/chromeos/login/login_wizard.h" |
52 #include "chrome/browser/chromeos/login/startup_utils.h" | 53 #include "chrome/browser/chromeos/login/startup_utils.h" |
53 #include "chrome/browser/chromeos/login/users/user.h" | 54 #include "chrome/browser/chromeos/login/users/user.h" |
54 #include "chrome/browser/chromeos/login/users/user_manager.h" | 55 #include "chrome/browser/chromeos/login/users/user_manager.h" |
55 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 56 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
56 #include "chrome/browser/chromeos/login/wizard_controller.h" | 57 #include "chrome/browser/chromeos/login/wizard_controller.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 | 136 |
136 // Class is used to login using passed username and password. | 137 // Class is used to login using passed username and password. |
137 // The instance will be deleted upon success or failure. | 138 // The instance will be deleted upon success or failure. |
138 class StubLogin : public LoginStatusConsumer, | 139 class StubLogin : public LoginStatusConsumer, |
139 public LoginUtils::Delegate { | 140 public LoginUtils::Delegate { |
140 public: | 141 public: |
141 StubLogin(std::string username, std::string password) | 142 StubLogin(std::string username, std::string password) |
142 : profile_prepared_(false) { | 143 : profile_prepared_(false) { |
143 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this); | 144 authenticator_ = LoginUtils::Get()->CreateAuthenticator(this); |
144 UserContext user_context(username); | 145 UserContext user_context(username); |
145 user_context.SetPassword(password); | 146 user_context.SetKey(Key(password)); |
146 authenticator_.get()->AuthenticateToLogin(ProfileHelper::GetSigninProfile(), | 147 authenticator_.get()->AuthenticateToLogin(ProfileHelper::GetSigninProfile(), |
147 user_context); | 148 user_context); |
148 } | 149 } |
149 | 150 |
150 virtual ~StubLogin() { | 151 virtual ~StubLogin() { |
151 LoginUtils::Get()->DelegateDeleted(this); | 152 LoginUtils::Get()->DelegateDeleted(this); |
152 } | 153 } |
153 | 154 |
154 virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE { | 155 virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE { |
155 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); | 156 LOG(ERROR) << "Login Failure: " << error.GetErrorString(); |
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
862 // Destroy DBus services immediately after threads are stopped. | 863 // Destroy DBus services immediately after threads are stopped. |
863 dbus_services_.reset(); | 864 dbus_services_.reset(); |
864 | 865 |
865 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 866 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
866 | 867 |
867 // Destroy DeviceSettingsService after g_browser_process. | 868 // Destroy DeviceSettingsService after g_browser_process. |
868 DeviceSettingsService::Shutdown(); | 869 DeviceSettingsService::Shutdown(); |
869 } | 870 } |
870 | 871 |
871 } // namespace chromeos | 872 } // namespace chromeos |
OLD | NEW |