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

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

Issue 83293004: kiosk: Show enrollment screen first if needed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fix LOG(INFO) Created 7 years 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/oobe_ui.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/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index 23d1a44e2faa2a086abfeefb3d805ea531effea7..35c60d340e576dfb5a4fe3a31b1c18277d27bcf7 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -417,8 +417,20 @@ void OobeUI::InitializeHandlers() {
ready_callbacks_[i].Run();
ready_callbacks_.clear();
- for (size_t i = 0; i < handlers_.size(); ++i)
- handlers_[i]->InitializeBase();
+ // Notify 'initialize' for synchronously loaded screens.
+ for (size_t i = 0; i < handlers_.size(); ++i) {
+ if (handlers_[i]->async_assets_load_id().empty())
+ handlers_[i]->InitializeBase();
+ }
+}
+
+void OobeUI::OnScreenAssetsLoaded(const std::string& async_assets_load_id) {
+ DCHECK(!async_assets_load_id.empty());
+
+ for (size_t i = 0; i < handlers_.size(); ++i) {
+ if (handlers_[i]->async_assets_load_id() == async_assets_load_id)
+ handlers_[i]->InitializeBase();
+ }
}
bool OobeUI::IsJSReady(const base::Closure& display_is_ready_callback) {
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698