Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6968)

Unified Diff: chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc

Issue 740973002: Fixed UI stuck on Network screen after rebooting on FRE screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
index 94fd12d720d8dab91ee4dafb9960fe99e14737b8..3e5210cad7aa6c0da330b436955dd776ce48c1d9 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
#include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
@@ -117,6 +118,7 @@ EnrollmentScreenHandler::EnrollmentScreenHandler(
network_state_informer_(network_state_informer),
error_screen_actor_(error_screen_actor),
histogram_helper_(new ErrorScreensHistogramHelper("Enrollment")),
+ auth_extension_(nullptr),
weak_ptr_factory_(this) {
set_async_assets_load_id(OobeUI::kScreenOobeEnrollment);
DCHECK(network_state_informer_.get());
@@ -173,6 +175,11 @@ void EnrollmentScreenHandler::PrepareToShow() {
}
void EnrollmentScreenHandler::Show() {
+ if (!auth_extension_) {
+ Profile* signin_profile = ProfileHelper::GetSigninProfile();
+ auth_extension_.reset(new ScopedGaiaAuthExtension(signin_profile));
+ }
+
if (!page_is_ready())
show_on_init_ = true;
else
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698