Chromium Code Reviews| 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 c5663e12484a50bbfeea08960ef0e2ddd6d953d1..5ac38d3c6fbd16b0bfc1808178b154b3eea90ad8 100644 |
| --- a/chrome/browser/ui/startup/startup_browser_creator.cc |
| +++ b/chrome/browser/ui/startup/startup_browser_creator.cc |
| @@ -40,6 +40,7 @@ |
| #include "chrome/browser/extensions/unpacked_installer.h" |
| #include "chrome/browser/first_run/first_run.h" |
| #include "chrome/browser/google/google_util.h" |
| +#include "chrome/browser/lifetime/application_lifetime.h" |
| #include "chrome/browser/notifications/desktop_notification_service.h" |
| #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| #include "chrome/browser/prefs/session_startup_pref.h" |
| @@ -74,6 +75,7 @@ |
| #if defined(OS_CHROMEOS) |
| #include "chrome/browser/chromeos/app_mode/app_launch_utils.h" |
| #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| +#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
| #include "chrome/browser/chromeos/login/user_manager.h" |
| #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| #include "chromeos/chromeos_switches.h" |
| @@ -616,6 +618,12 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( |
| // Skip browser launch since app mode launches its app window. |
| silent_launch = true; |
| } |
| + |
| + if (chromeos::DemoAppLauncher::IsDemoAppSession( |
|
xiyuan
2014/02/12 00:03:22
nit: Add a comment to explain why we terminate ses
rkc
2014/02/12 00:08:07
Done.
|
| + command_line.GetSwitchValueASCII(chromeos::switches::kLoginUser))) { |
| + chrome::AttemptUserExit(); |
| + return false; |
| + } |
| #endif |
| #if defined(TOOLKIT_VIEWS) && defined(USE_X11) |