diff options
Diffstat (limited to 'chromium/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc')
-rw-r--r-- | chromium/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chromium/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc index d0fa17ef808..6d632c707cf 100644 --- a/chromium/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc +++ b/chromium/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc @@ -42,6 +42,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_urls.h" #include "google_apis/gaia/google_service_auth_error.h" +#include "services/network/public/mojom/cookie_manager.mojom.h" #include "ui/base/l10n/l10n_util.h" #include "ui/chromeos/devicetype_utils.h" @@ -154,7 +155,7 @@ base::ListValue GetEncryptionTypesList() { enc_option.SetKey("value", base::Value(enc_types.id)); enc_option.SetKey("selected", base::Value(default_types == enc_types.encryption_types)); - encryption_list.GetList().emplace_back(std::move(enc_option)); + encryption_list.Append(std::move(enc_option)); } return encryption_list; } @@ -649,7 +650,7 @@ void EnrollmentScreenHandler::OnAdConfigurationUnlocked( custom.SetKey( "name", base::Value(l10n_util::GetStringUTF8(IDS_AD_CONFIG_SELECTION_CUSTOM))); - options->GetList().push_back(std::move(custom)); + options->Append(std::move(custom)); active_directory_join_type_ = ActiveDirectoryDomainJoinType::USING_CONFIGURATION; CallJS("login.OAuthEnrollmentScreen.setAdJoinConfiguration", *options); @@ -788,11 +789,10 @@ void EnrollmentScreenHandler::HandleCompleteLogin(const std::string& user) { Profile::FromWebUI(web_ui())); content::StoragePartition* partition = signin_partition_manager->GetCurrentStoragePartition(); - net::CookieOptions cookie_options; - cookie_options.set_include_httponly(); partition->GetCookieManagerForBrowserProcess()->GetCookieList( - GaiaUrls::GetInstance()->gaia_url(), cookie_options, + GaiaUrls::GetInstance()->gaia_url(), + net::CookieOptions::MakeAllInclusive(), base::BindOnce(&EnrollmentScreenHandler::OnGetCookiesForCompleteLogin, weak_ptr_factory_.GetWeakPtr(), user)); } |