| Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
|
| index cb931af3f0d7ab098d1e2d81efdf3ba0a5b429ca..a1a30365a94a78c2c6c98c54d1ef4130b1739cd9 100644
|
| --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
|
| @@ -360,7 +360,7 @@ void UserManagerScreenHandler::SetAuthType(
|
| web_ui()->CallJavascriptFunctionUnsafe(
|
| "login.AccountPickerScreen.setAuthType",
|
| base::StringValue(account_id.GetUserEmail()),
|
| - base::FundamentalValue(auth_type), base::StringValue(auth_value));
|
| + base::Value(auth_type), base::StringValue(auth_value));
|
| }
|
|
|
| proximity_auth::ScreenlockBridge::LockHandler::AuthType
|
| @@ -398,8 +398,8 @@ void UserManagerScreenHandler::HandleInitialize(const base::ListValue* args) {
|
| SendUserList();
|
| web_ui()->CallJavascriptFunctionUnsafe(
|
| "cr.ui.UserManager.showUserManagerScreen",
|
| - base::FundamentalValue(IsGuestModeEnabled()),
|
| - base::FundamentalValue(IsAddPersonEnabled()));
|
| + base::Value(IsGuestModeEnabled()),
|
| + base::Value(IsAddPersonEnabled()));
|
|
|
| proximity_auth::ScreenlockBridge::Get()->SetLockHandler(this);
|
| }
|
| @@ -524,7 +524,7 @@ void UserManagerScreenHandler::HandleAreAllProfilesLocked(
|
| AllowJavascript();
|
| ResolveJavascriptCallback(
|
| base::StringValue(webui_callback_id),
|
| - base::FundamentalValue(
|
| + base::Value(
|
| profiles::AreAllNonChildNonSupervisedProfilesLocked()));
|
| }
|
|
|
| @@ -678,7 +678,7 @@ void UserManagerScreenHandler::HandleGetRemoveWarningDialogMessage(
|
|
|
| web_ui()->CallJavascriptFunctionUnsafe(
|
| "updateRemoveWarningDialogSetMessage", base::StringValue(profile_path),
|
| - message, base::FundamentalValue(total_count));
|
| + message, base::Value(total_count));
|
| }
|
|
|
| void UserManagerScreenHandler::OnGetTokenInfoResponse(
|
| @@ -951,7 +951,7 @@ void UserManagerScreenHandler::SendUserList() {
|
|
|
| web_ui()->CallJavascriptFunctionUnsafe(
|
| "login.AccountPickerScreen.loadUsers", users_list,
|
| - base::FundamentalValue(IsGuestModeEnabled()));
|
| + base::Value(IsGuestModeEnabled()));
|
|
|
| // This is the latest C++ code we have in the flow to show the UserManager.
|
| // This may be invoked more than once per UserManager lifetime; the
|
| @@ -973,12 +973,12 @@ void UserManagerScreenHandler::ReportAuthenticationResult(
|
| ProfileMetrics::SWITCH_PROFILE_UNLOCK);
|
| } else {
|
| web_ui()->CallJavascriptFunctionUnsafe(
|
| - "cr.ui.UserManager.showSignInError", base::FundamentalValue(0),
|
| + "cr.ui.UserManager.showSignInError", base::Value(0),
|
| base::StringValue(l10n_util::GetStringUTF8(
|
| auth == ProfileMetrics::AUTH_FAILED_OFFLINE
|
| ? IDS_LOGIN_ERROR_AUTHENTICATING_OFFLINE
|
| : IDS_LOGIN_ERROR_AUTHENTICATING)),
|
| - base::StringValue(""), base::FundamentalValue(0));
|
| + base::StringValue(""), base::Value(0));
|
| }
|
| }
|
|
|
|
|