Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Issue 14306004: Put Kiosk App parameters into device settings. (Closed)

Created:
7 years, 8 months ago by Mattias Nissler (ping if slow)
Modified:
7 years, 7 months ago
CC:
chromium-reviews, oshima+watch_chromium.org, stevenjb+watch_chromium.org, nkostylev+watch_chromium.org, davemoore+watch_chromium.org, xiyuan, zel
Visibility:
Public.

Description

Put Kiosk App parameters into device settings. Remove the existing Kiosk App loading logic that presisted data in local_state and replace it by code that reads/writes from/to device settings. We're now using the existing device-local accounts users list, which is also one step towards handling kiosk apps within the standard login/user framework. BUG=chromium:216359 TEST=Configure Kiosk App in device settings, observe it showing up on the login screen. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=197892

Patch Set 1 #

Total comments: 2

Patch Set 2 : Rebase #

Total comments: 16

Patch Set 3 : Address comments, fix local-owner editing of settings. #

Patch Set 4 : Make kiosk app ID a separate field in policy. #

Total comments: 43

Patch Set 5 : Address comments, switch to new device settings layout. #

Patch Set 6 : Rebase. #

Total comments: 4

Patch Set 7 : Address comments, fix tests. #

Patch Set 8 : Handle clearing of the auto launch ID more gracefully. #

Total comments: 6

Patch Set 9 : Address Xiyuan's comments. #

Patch Set 10 : Rebase. #

Patch Set 11 : Take into account forward-compatibility for device settings format. #

Patch Set 12 : Rebase #

Total comments: 6

Patch Set 13 : Address Joao's comments. #

Total comments: 12

Patch Set 14 : Address Bin's comments. #

Patch Set 15 : Fix proto tag. #

Patch Set 16 : Last naming adjustments. #

Patch Set 17 : Rebase. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+586 lines, -401 lines) Patch
M chrome/app/policy/policy_templates.json View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +20 lines, -1 line 0 comments Download
M chrome/browser/chromeos/app_mode/kiosk_app_manager.h View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/chromeos/app_mode/kiosk_app_manager.cc View 1 2 3 4 5 6 7 8 7 chunks +145 lines, -37 lines 0 comments Download
M chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc View 1 2 3 4 5 6 7 8 9 2 chunks +17 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h View 1 2 3 4 5 6 7 8 1 chunk +5 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/login/existing_user_controller.cc View 1 2 3 4 5 2 chunks +7 lines, -0 lines 0 comments Download
M chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 5 chunks +18 lines, -1 line 0 comments Download
M chrome/browser/chromeos/login/existing_user_controller_browsertest.cc View 1 2 3 4 5 6 7 8 9 10 3 chunks +6 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/login/user_manager_impl.h View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 1 chunk +3 lines, -0 lines 0 comments Download
M chrome/browser/chromeos/login/user_manager_impl.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 3 chunks +37 lines, -5 lines 0 comments Download
M chrome/browser/chromeos/policy/app_pack_updater.h View 1 2 3 1 chunk +0 lines, -4 lines 0 comments Download
M chrome/browser/chromeos/policy/app_pack_updater.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 2 chunks +2 lines, -5 lines 0 comments Download
M chrome/browser/chromeos/policy/device_local_account_browsertest.cc View 1 2 3 4 5 6 7 8 9 10 2 chunks +15 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/policy/device_local_account_policy_service.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +34 lines, -24 lines 0 comments Download
M chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc View 1 2 3 4 5 6 7 8 9 10 2 chunks +10 lines, -4 lines 0 comments Download
M chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 4 chunks +40 lines, -7 lines 0 comments Download
M chrome/browser/chromeos/settings/cros_settings.h View 1 2 3 4 5 2 chunks +3 lines, -0 lines 0 comments Download
M chrome/browser/chromeos/settings/cros_settings.cc View 1 2 3 4 5 3 chunks +10 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/settings/cros_settings_names.h View 1 2 3 4 2 chunks +16 lines, -0 lines 0 comments Download
M chrome/browser/chromeos/settings/cros_settings_names.cc View 1 2 3 4 5 chunks +13 lines, -19 lines 0 comments Download
M chrome/browser/chromeos/settings/device_settings_provider.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 8 chunks +92 lines, -25 lines 0 comments Download
M chrome/browser/chromeos/settings/device_settings_provider_unittest.cc View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 1 chunk +23 lines, -0 lines 0 comments Download
D chrome/browser/chromeos/settings/kiosk_app_local_settings.h View 1 chunk +0 lines, -52 lines 0 comments Download
D chrome/browser/chromeos/settings/kiosk_app_local_settings.cc View 1 chunk +0 lines, -176 lines 0 comments Download
M chrome/browser/chromeos/settings/stub_cros_settings_provider.cc View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/policy/proto/chromeos/chrome_device_policy.proto View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 2 chunks +45 lines, -6 lines 0 comments Download
M chrome/browser/resources/options/chromeos/kiosk_app_disable_bailout_confirm.js View 1 2 1 chunk +3 lines, -1 line 0 comments Download
M chrome/browser/resources/options/chromeos/kiosk_apps.html View 1 2 1 chunk +2 lines, -1 line 0 comments Download
M chrome/browser/resources/options/chromeos/kiosk_apps.js View 1 2 1 chunk +4 lines, -2 lines 0 comments Download
M chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h View 1 2 3 4 5 6 7 8 3 chunks +5 lines, -6 lines 0 comments Download
M chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc View 1 2 3 4 5 6 7 8 3 chunks +6 lines, -9 lines 0 comments Download
M chrome/chrome_browser_chromeos.gypi View 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 1 chunk +0 lines, -2 lines 0 comments Download
M chrome/test/data/policy/policy_test_cases.json View 1 chunk +3 lines, -0 lines 0 comments Download

Messages

Total messages: 31 (0 generated)
Mattias Nissler (ping if slow)
Bartosz, Nikita: This is the CL that rewires kiosk app persistence to use device-local account ...
7 years, 8 months ago (2013-04-22 18:26:17 UTC) #1
xiyuan
LGTM We also need to wire OnKioskAppsListChanged in KioskAppsHandler, which was lost when I refactor ...
7 years, 8 months ago (2013-04-22 20:01:04 UTC) #2
xiyuan
https://codereview.chromium.org/14306004/diff/1/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc File chrome/browser/chromeos/app_mode/kiosk_app_manager.cc (right): https://codereview.chromium.org/14306004/diff/1/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc#newcode87 chrome/browser/chromeos/app_mode/kiosk_app_manager.cc:87: CrosSettings::Get()->SetInteger(kAccountsPrefDeviceLocalAccountAutoLoginId, Is this kAccountsPrefDeviceLocalAccountAutoLoginDelay instead of AutoLoginId?
7 years, 8 months ago (2013-04-23 06:36:56 UTC) #3
Mattias Nissler (ping if slow)
+bartfab whom I missed originally. https://codereview.chromium.org/14306004/diff/1/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc File chrome/browser/chromeos/app_mode/kiosk_app_manager.cc (right): https://codereview.chromium.org/14306004/diff/1/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc#newcode87 chrome/browser/chromeos/app_mode/kiosk_app_manager.cc:87: CrosSettings::Get()->SetInteger(kAccountsPrefDeviceLocalAccountAutoLoginId, On 2013/04/23 06:36:56, ...
7 years, 8 months ago (2013-04-23 14:01:01 UTC) #4
bartfab (slow)
LGTM with a few nits https://codereview.chromium.org/14306004/diff/7001/chrome/app/policy/policy_templates.json File chrome/app/policy/policy_templates.json (right): https://codereview.chromium.org/14306004/diff/7001/chrome/app/policy/policy_templates.json#newcode3608 chrome/app/policy/policy_templates.json:3608: If this policy is ...
7 years, 8 months ago (2013-04-23 15:59:40 UTC) #5
Nikita (slow)
chromeos/login lgtm https://codereview.chromium.org/14306004/diff/7001/chrome/browser/chromeos/login/user_manager_impl.cc File chrome/browser/chromeos/login/user_manager_impl.cc (right): https://codereview.chromium.org/14306004/diff/7001/chrome/browser/chromeos/login/user_manager_impl.cc#newcode889 chrome/browser/chromeos/login/user_manager_impl.cc:889: base::ListValue public_accounts; nit: Could this be extracted ...
7 years, 8 months ago (2013-04-23 17:04:49 UTC) #6
kenlin
https://codereview.chromium.org/14306004/diff/7001/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto File chrome/browser/chromeos/policy/proto/chrome_device_policy.proto (right): https://codereview.chromium.org/14306004/diff/7001/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto#newcode246 chrome/browser/chromeos/policy/proto/chrome_device_policy.proto:246: optional string id = 1; Did I understand correctly ...
7 years, 8 months ago (2013-04-23 18:09:42 UTC) #7
Mattias Nissler (ping if slow)
https://codereview.chromium.org/14306004/diff/7001/chrome/app/policy/policy_templates.json File chrome/app/policy/policy_templates.json (right): https://codereview.chromium.org/14306004/diff/7001/chrome/app/policy/policy_templates.json#newcode3608 chrome/app/policy/policy_templates.json:3608: If this policy is set to False, auto-login (if ...
7 years, 8 months ago (2013-04-23 18:28:10 UTC) #8
Mattias Nissler (ping if slow)
Here's a new approach with the app ID as a separate field. I think that's ...
7 years, 8 months ago (2013-04-24 21:00:59 UTC) #9
xiyuan
SLGTM https://codereview.chromium.org/14306004/diff/25001/chrome/browser/resources/options/chromeos/kiosk_app_disable_bailout_confirm.js File chrome/browser/resources/options/chromeos/kiosk_app_disable_bailout_confirm.js (right): https://codereview.chromium.org/14306004/diff/25001/chrome/browser/resources/options/chromeos/kiosk_app_disable_bailout_confirm.js#newcode35 chrome/browser/resources/options/chromeos/kiosk_app_disable_bailout_confirm.js:35: 'cros.accounts.deviceLocalAccountAutoLoginBailoutEnabled', Why not use el.pref to keep the ...
7 years, 8 months ago (2013-04-24 22:20:36 UTC) #10
bartfab (slow)
https://codereview.chromium.org/14306004/diff/25001/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc File chrome/browser/chromeos/app_mode/kiosk_app_manager.cc (right): https://codereview.chromium.org/14306004/diff/25001/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc#newcode96 chrome/browser/chromeos/app_mode/kiosk_app_manager.cc:96: scoped_ptr<base::DictionaryValue> new_accounts_dict( Nit: #include "base/memory/scoped_ptr.h" https://codereview.chromium.org/14306004/diff/25001/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc#newcode99 chrome/browser/chromeos/app_mode/kiosk_app_manager.cc:99: scoped_ptr<base::DictionaryValue> entry_dict(new ...
7 years, 8 months ago (2013-04-25 11:17:28 UTC) #11
xiyuan
https://codereview.chromium.org/14306004/diff/25001/chrome/browser/chromeos/login/user_manager.cc File chrome/browser/chromeos/login/user_manager.cc (right): https://codereview.chromium.org/14306004/diff/25001/chrome/browser/chromeos/login/user_manager.cc#newcode65 chrome/browser/chromeos/login/user_manager.cc:65: user_id.substr(0, user_id.size() - arraysize(kKioskAppUserDomain))); On 2013/04/25 11:17:28, bartfab wrote: ...
7 years, 8 months ago (2013-04-25 17:26:32 UTC) #12
Mattias Nissler (ping if slow)
Hey guys, new version is up for review. I hope I'm closing in on this ...
7 years, 8 months ago (2013-04-26 09:10:05 UTC) #13
bartfab (slow)
lgtm https://codereview.chromium.org/14306004/diff/53028/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc File chrome/browser/chromeos/app_mode/kiosk_app_manager.cc (right): https://codereview.chromium.org/14306004/diff/53028/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc#newcode254 chrome/browser/chromeos/app_mode/kiosk_app_manager.cc:254: std::string auto_login_account_id_; Nit: Remove trailing underscore. https://codereview.chromium.org/14306004/diff/53028/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc#newcode259 chrome/browser/chromeos/app_mode/kiosk_app_manager.cc:259: ...
7 years, 8 months ago (2013-04-26 12:34:59 UTC) #14
Mattias Nissler (ping if slow)
Here's a new version that fixes failing tests and addresses Bartosz' latest comments. https://codereview.chromium.org/14306004/diff/53028/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc File ...
7 years, 8 months ago (2013-04-26 13:44:46 UTC) #15
xiyuan
https://codereview.chromium.org/14306004/diff/78001/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc File chrome/browser/chromeos/app_mode/kiosk_app_manager.cc (right): https://codereview.chromium.org/14306004/diff/78001/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc#newcode138 chrome/browser/chromeos/app_mode/kiosk_app_manager.cc:138: return; nit: 1 more space indentation. https://codereview.chromium.org/14306004/diff/78001/chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h File chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h ...
7 years, 8 months ago (2013-04-26 17:15:13 UTC) #16
Mattias Nissler (ping if slow)
OK, addressed Xiyuan's comments. If there are no further complaints, I'll land this now. https://codereview.chromium.org/14306004/diff/78001/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc ...
7 years, 7 months ago (2013-04-29 18:25:17 UTC) #17
xiyuan
Launch it!
7 years, 7 months ago (2013-04-29 19:03:27 UTC) #18
Mattias Nissler (ping if slow)
Ha, I almost launched it :) Turns out that there's an issue with forward-compatibility: If ...
7 years, 7 months ago (2013-04-30 13:15:24 UTC) #19
Mattias Nissler (ping if slow)
Adding Joao for realz.
7 years, 7 months ago (2013-04-30 13:28:35 UTC) #20
Joao da Silva
lgtm. Bin should agree with the proto changes before landing. https://codereview.chromium.org/14306004/diff/103001/chrome/app/policy/policy_templates.json File chrome/app/policy/policy_templates.json (right): https://codereview.chromium.org/14306004/diff/103001/chrome/app/policy/policy_templates.json#newcode3603 ...
7 years, 7 months ago (2013-04-30 14:31:14 UTC) #21
Mattias Nissler (ping if slow)
Addressed Joao's nits. Bin, here are the policy changes for defining Kiosk Apps, can you ...
7 years, 7 months ago (2013-04-30 14:51:45 UTC) #22
binzhao
https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto File chrome/browser/policy/proto/chromeos/chrome_device_policy.proto (right): https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto#newcode235 chrome/browser/policy/proto/chromeos/chrome_device_policy.proto:235: optional string deprecated_public_session_id = 1; My understanding is that ...
7 years, 7 months ago (2013-04-30 22:01:10 UTC) #23
Mattias Nissler (ping if slow)
https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto File chrome/browser/policy/proto/chromeos/chrome_device_policy.proto (right): https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto#newcode235 chrome/browser/policy/proto/chromeos/chrome_device_policy.proto:235: optional string deprecated_public_session_id = 1; On 2013/04/30 22:01:10, binzhao ...
7 years, 7 months ago (2013-04-30 23:37:36 UTC) #24
binzhao
https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto File chrome/browser/policy/proto/chromeos/chrome_device_policy.proto (right): https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto#newcode235 chrome/browser/policy/proto/chromeos/chrome_device_policy.proto:235: optional string deprecated_public_session_id = 1; OK, I agree when ...
7 years, 7 months ago (2013-05-01 00:30:44 UTC) #25
Mattias Nissler (ping if slow)
https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto File chrome/browser/policy/proto/chromeos/chrome_device_policy.proto (right): https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto#newcode235 chrome/browser/policy/proto/chromeos/chrome_device_policy.proto:235: optional string deprecated_public_session_id = 1; On 2013/05/01 00:30:44, binzhao ...
7 years, 7 months ago (2013-05-01 10:10:55 UTC) #26
Mattias Nissler (ping if slow)
New version is up. Bin: Good to go?
7 years, 7 months ago (2013-05-01 16:38:23 UTC) #27
binzhao
lgtm https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto File chrome/browser/policy/proto/chromeos/chrome_device_policy.proto (right): https://codereview.chromium.org/14306004/diff/102004/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto#newcode235 chrome/browser/policy/proto/chromeos/chrome_device_policy.proto:235: optional string deprecated_public_session_id = 1; Is there a ...
7 years, 7 months ago (2013-05-01 16:56:48 UTC) #28
binzhao
btw, since you change the field name, if you just sync this proto over to ...
7 years, 7 months ago (2013-05-01 17:08:34 UTC) #29
Mattias Nissler (ping if slow)
On 2013/05/01 17:08:34, binzhao wrote: > btw, since you change the field name, if you ...
7 years, 7 months ago (2013-05-02 08:10:38 UTC) #30
Mattias Nissler (ping if slow)
7 years, 7 months ago (2013-05-02 11:09:00 UTC) #31
Message was sent while issue was closed.
Committed patchset #17 manually as r197892 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698