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

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

Issue 2649103006: arc: Add splash screen for ARC++ Kiosk startup (Closed)
Patch Set: Created 3 years, 11 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.h
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.h b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
index 68cbabed199b5c032e1b0c9619f0f799aba06760..e20a8864de9097e4cd04f98d3e9c4b0587ad2dea 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.h
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
@@ -15,6 +15,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/chromeos/login/app_launch_controller.h"
+#include "chrome/browser/chromeos/login/arc_kiosk_controller.h"
Luis Héctor Chávez 2017/01/24 18:40:24 nit: remove and fwd-declare ArcKioskController
Sergey Poromov 2017/01/25 14:29:22 Done.
#include "chrome/browser/chromeos/login/auth/auth_prewarmer.h"
#include "chrome/browser/chromeos/login/existing_user_controller.h"
#include "chrome/browser/chromeos/login/signin_screen_controller.h"
@@ -84,6 +85,7 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
bool diagnostic_mode,
bool auto_launch) override;
void StartDemoAppLaunch() override;
+ void StartArcKiosk(const AccountId& account_id) override;
// Creates WizardController instance.
WizardController* CreateWizardController();
@@ -217,6 +219,9 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
// Demo app launcher.
std::unique_ptr<DemoAppLauncher> demo_app_launcher_;
+ // ARC kiosk controller.
+ std::unique_ptr<ArcKioskController> arc_kiosk_controller_;
+
// Make sure chrome won't exit while we are at login/oobe screen.
std::unique_ptr<ScopedKeepAlive> keep_alive_;

Powered by Google App Engine
This is Rietveld 408576698