Refactor kiosk app launch to be part of login screen UI flow.

chrome/browser/ui/startup/startup_browser_creator.cc

Index: chrome/browser/ui/startup/startup_browser_creator.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 513d982c49fb4b5e27eddf086ab819b832f74419..c97459a4013677bf7f439a68af4c80a73696e89b 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -65,7 +65,6 @@
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -593,16 +592,6 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
     silent_launch = true;
   }
 
-  if (chrome::IsRunningInAppMode() &&
-      command_line.HasSwitch(switches::kAppId)) {
-    // StartupAppLauncher deletes itself when done.
-    (new chromeos::StartupAppLauncher(
-        last_used_profile,
-        command_line.GetSwitchValueASCII(switches::kAppId)))->Start();
-
-    // Skip browser launch since app mode launches its app window.
-    silent_launch = true;
-  }

[xiyuan, 2013/08/15 18:19:42]

We would need to do something here to handle relaunching the app after chrome
crashed and restarted by the session manager.

[Tim Song, 2013/08/16 19:07:59]

Done.

 #endif
 
 #if defined(TOOLKIT_VIEWS) && defined(USE_X11)