| Index: chrome/browser/chromeos/login/existing_user_controller.h
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
|
| index 0eb01b89eade16b911f5c5776b7896a3cdd45e4e..eea1471d577f449390b1d7cea5eac70e9f533773 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.h
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.h
|
| @@ -18,6 +18,7 @@
|
| #include "base/timer/timer.h"
|
| #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
|
| #include "chrome/browser/chromeos/login/session/user_session_manager.h"
|
| +#include "chrome/browser/chromeos/login/signin/token_handle_util.h"
|
| #include "chrome/browser/chromeos/login/ui/login_display.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/chromeos/settings/device_settings_service.h"
|
| @@ -242,6 +243,13 @@
|
| // Callback invoked when |oauth2_token_initializer_| has finished.
|
| void OnOAuth2TokensFetched(bool success, const UserContext& user_context);
|
|
|
| + // Callback invoked when |token_handle_util_| has finished.
|
| + void OnTokenHandleObtained(const user_manager::UserID& id,
|
| + TokenHandleUtil::TokenHandleStatus status);
|
| +
|
| + // Returns |true| if token handles should be used on this device.
|
| + bool TokenHandlesEnabled();
|
| +
|
| // Public session auto-login timer.
|
| scoped_ptr<base::OneShotTimer<ExistingUserController> > auto_login_timer_;
|
|
|
| @@ -330,6 +338,7 @@
|
| bootstrap_user_context_initializer_;
|
|
|
| scoped_ptr<OAuth2TokenInitializer> oauth2_token_initializer_;
|
| + scoped_ptr<TokenHandleUtil> token_handle_util_;
|
|
|
| FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, ExistingUserLogin);
|
|
|
|
|