diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 03:25:56 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 03:25:56 +0000 |
| commit | 0f42f11ccbb7de2dbea2404481985a9473e694bd (patch) | |
| tree | c7f1fdce20a699e0e2d2dfe275f19fe311cdca53 /chromeos/settings | |
| parent | 2a75eccb132d1027985f5e1909de3fa19a008227 (diff) | |
| download | chromium_src-0f42f11ccbb7de2dbea2404481985a9473e694bd.zip chromium_src-0f42f11ccbb7de2dbea2404481985a9473e694bd.tar.gz chromium_src-0f42f11ccbb7de2dbea2404481985a9473e694bd.tar.bz2 | |
kiosk: Network connectivity test during launch.
- Add NetworkStateInformer and ErrorScreenActor to
AppLaunchSplashScreenHandler;
- AppLaunchSplashScreenHandler sends network state
to its delegate (AppLaunchController) during network
check;
- AppLaunchController decides when to show network
configure UI and call AppLaunchSplashScreenActor
to show it (via ErrorScreenActor);
- Show network config UI for enterprise kiosk;
- Add a 'Reboot' button for kiosk network error;
- Add a PromptForNetworkWhenOffline boolean field to
DeviceLocalAccountsProto to control whether to show
network config UI for enterprise managed kiosk;
BUG=314710
TEST=KioskTest.LaunchAppNetworkDown/Portal
Review URL: https://codereview.chromium.org/79113002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/settings')
| -rw-r--r-- | chromeos/settings/cros_settings_names.cc | 2 | ||||
| -rw-r--r-- | chromeos/settings/cros_settings_names.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/settings/cros_settings_names.cc b/chromeos/settings/cros_settings_names.cc index fbc30a3..d28c01d 100644 --- a/chromeos/settings/cros_settings_names.cc +++ b/chromeos/settings/cros_settings_names.cc @@ -30,6 +30,8 @@ const char kAccountsPrefDeviceLocalAccountAutoLoginDelay[] = "cros.accounts.deviceLocalAccountAutoLoginDelay"; const char kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled[] = "cros.accounts.deviceLocalAccountAutoLoginBailoutEnabled"; +const char kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline[] = + "cros.accounts.deviceLocalAccountPromptForNetworkWhenOffline"; const char kAccountsPrefSupervisedUsersEnabled[] = "cros.accounts.supervisedUsersEnabled"; diff --git a/chromeos/settings/cros_settings_names.h b/chromeos/settings/cros_settings_names.h index ffaf6f4..854c6bc 100644 --- a/chromeos/settings/cros_settings_names.h +++ b/chromeos/settings/cros_settings_names.h @@ -27,6 +27,8 @@ CHROMEOS_EXPORT extern const char kAccountsPrefDeviceLocalAccountAutoLoginDelay[]; CHROMEOS_EXPORT extern const char kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled[]; +CHROMEOS_EXPORT extern const char + kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline[]; CHROMEOS_EXPORT extern const char kAccountsPrefSupervisedUsersEnabled[]; CHROMEOS_EXPORT extern const char kSignedDataRoamingEnabled[]; |