diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 02:41:53 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 02:41:53 +0000 |
| commit | 1b28c7e137b0d9035a97b8618d281772c064ee46 (patch) | |
| tree | a9f1168b0bf73259ff6cfa5debafff103e263aee /chrome/browser/extensions/startup_helper.cc | |
| parent | 55378de3b25ce9598e50734d3b21ba0e43854665 (diff) | |
| download | chromium_src-1b28c7e137b0d9035a97b8618d281772c064ee46.zip chromium_src-1b28c7e137b0d9035a97b8618d281772c064ee46.tar.gz chromium_src-1b28c7e137b0d9035a97b8618d281772c064ee46.tar.bz2 | |
cros: More kiosk app launch business.
- Add StartupAppLauncher to launch kiosk app to get rid of nested message loop
and we no longer need "install-from-webstore" switch;
- Implement auto launch from login screen;
- Add a shortcut key (Ctrl-Alt-Shift-X) to bail out from app launch and return to
login screen;
BUG=173803
TEST=Verify kiosk app could be launched via menu, auto launched and hold
shortcut key on app splash screen would return to login screen.
R=zelidrag@chromium.org,sky@chromium.org,asargent@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12382020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/startup_helper.cc')
| -rw-r--r-- | chrome/browser/extensions/startup_helper.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index a0add61..0958aa0 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc @@ -173,9 +173,7 @@ bool StartupHelper::InstallFromWebstore(const CommandLine& cmd_line, AppInstallHelper helper; helper.BeginInstall(profile, id, - cmd_line.HasSwitch(switches::kForceAppMode) ? - WebstoreStandaloneInstaller::SKIP_PROMPT : - WebstoreStandaloneInstaller::STANDARD_PROMPT, + WebstoreStandaloneInstaller::STANDARD_PROMPT, MessageLoop::QuitWhenIdleClosure()); MessageLoop::current()->Run(); |