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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup (Closed)
Patch Set: achuithb@ comments Created 3 years, 10 months 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
Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index d14718a07fa62b1e359f2e849d93c037af3049e2..8220357b40475a90cee41fa3380d917ff89ed536 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -35,6 +35,7 @@
#include "chrome/browser/chromeos/first_run/first_run.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/language_preferences.h"
+#include "chrome/browser/chromeos/login/arc_kiosk_controller.h"
#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
#include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
@@ -80,6 +81,7 @@
#include "chromeos/timezone/timezone_resolver.h"
#include "components/prefs/pref_service.h"
#include "components/session_manager/core/session_manager.h"
+#include "components/signin/core/account_id/account_id.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/notification_service.h"
@@ -126,6 +128,9 @@ const char kUserAddingURL[] = "chrome://oobe/user-adding";
// URL which corresponds to the app launch splash WebUI.
const char kAppLaunchSplashURL[] = "chrome://oobe/app-launch-splash";
+// URL which corresponds to the ARC kiosk splash WebUI.
+const char kArcKioskSplashURL[] = "chrome://oobe/arc-kiosk-splash";
+
// Duration of sign-in transition animation.
const int kLoginFadeoutTransitionDurationMs = 700;
@@ -784,6 +789,26 @@ void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
app_launch_controller_->StartAppLaunch(auto_launch);
}
+void LoginDisplayHostImpl::StartArcKiosk(const AccountId& account_id) {
+ VLOG(1) << "Login WebUI >> start ARC kiosk.";
+ SetStatusAreaVisible(false);
+
+ // Animation is not supported in Mash.
+ if (!chrome::IsRunningInMash())
+ finalize_animation_type_ = ANIMATION_FADE_OUT;
+ if (!login_window_) {
+ LoadURL(GURL(kAppLaunchSplashURL));
+ LoadURL(GURL(kArcKioskSplashURL));
+ }
+
+ login_view_->set_should_emit_login_prompt_visible(false);
+
+ arc_kiosk_controller_ =
+ base::MakeUnique<ArcKioskController>(this, GetOobeUI());
+
+ arc_kiosk_controller_->StartArcKiosk(account_id);
+}
+
////////////////////////////////////////////////////////////////////////////////
// LoginDisplayHostImpl, public
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.h ('k') | chrome/browser/chromeos/login/ui/mock_login_display_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698