Add ARC++ kiosk menu items and ability to start kiosk session.

chrome/browser/chromeos/login/session/user_session_manager.cc

Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index 70dd32e6201a25ed65e5c2b7cf0a8a1c1ffef9d1..a7a30c03f888c848016c55178ba3ffcc0e4140f8 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -1294,7 +1294,8 @@ bool UserSessionManager::InitializeUserSession(Profile* profile) {
 
 void UserSessionManager::InitSessionRestoreStrategy() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  bool in_app_mode = chrome::IsRunningInForcedAppMode();
+  bool in_app_mode =
+      chrome::IsRunningInForcedAppMode() || chrome::IsRunningInAndroidAppMode();
 
   // Are we in kiosk app mode?
   if (in_app_mode) {
@@ -1327,10 +1328,10 @@ void UserSessionManager::RestoreAuthSessionImpl(
     bool restore_from_auth_cookies) {
   CHECK((authenticator_.get() && authenticator_->authentication_context()) ||
         !restore_from_auth_cookies);
-
   if (chrome::IsRunningInForcedAppMode() ||
       base::CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kDisableGaiaServices)) {
+          chromeos::switches::kDisableGaiaServices) ||
+      chrome::IsRunningInAndroidAppMode()) {

[Luis Héctor Chávez, 2016/11/12 18:03:08]

nit: put the Forced and Android app mode checks together.

[Sergey Poromov, 2016/11/14 17:23:23]

Done.

     return;
   }