cros: Move kiosk settings to extensions page.

cros: Move kiosk settings to extensions page.

- Move kiosk settings to extensions page;
- Remove the M28 temp flag;

BUG=228860
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203327

[Dan Beam, 2013-05-30 21:14:54]

generally lg

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File
chrome/browser/resources/extensions/chromeos/kiosk_app_disable_bailout_confirm.js
(right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/chromeos/kiosk_app_disable_bailout_confirm.js:19:
initializePage: function() {
nit: I would maybe consider renaming this to avoid confusion (i.e. initialize())

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File chrome/browser/resources/extensions/chromeos/kiosk_apps.css (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/chromeos/kiosk_apps.css:22: /* TODO(xiyuan):
The .row-delete-button rules probably should live somewherei
s/somewherei/somewhere/

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File chrome/browser/resources/extensions/chromeos/kiosk_apps.js (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/chromeos/kiosk_apps.js:25: initializePage:
function() {
same

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/chromeos/kiosk_apps.js:89: *         apps:
!Array.<Object>,
@param {!Object.<{apps: !Array.<!Object>, disableBailout: boolean}>}

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File chrome/browser/resources/extensions/extensions.html (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/extensions.html:47: <if
expr="pp_ifdef('chromeos')">
nit: no indent, like with #if

    <include ...
<if expr="pp_ifdef('chromeos')">
    <include ...

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/extensions.html:78: <if
expr="pp_ifdef('chromeos')">
same

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File chrome/browser/resources/extensions/extensions.js (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/extensions.js:132:
extensions.KioskDisableBailoutConfirm.getInstance();
nit: extensions.KioskDisableBailoutConfirm.getInstance().initializePage();

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
File chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_browsertest.js
(right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_browsertest.js:21: * Mock
settings data.
@private

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
File chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc:125:
!CommandLine::ForCurrentProcess()->HasSwitch(
nit: indent off

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc:176:
l10n_util::GetStringUTF16(IDS_DONE));
nit: this could probably fit in one line

[xiyuan, 2013-05-30 23:03:37]

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File
chrome/browser/resources/extensions/chromeos/kiosk_app_disable_bailout_confirm.js
(right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/chromeos/kiosk_app_disable_bailout_confirm.js:19:
initializePage: function() {
On 2013/05/30 21:14:55, Dan Beam wrote:
> nit: I would maybe consider renaming this to avoid confusion (i.e.
initialize())

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File chrome/browser/resources/extensions/chromeos/kiosk_apps.css (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/chromeos/kiosk_apps.css:22: /* TODO(xiyuan):
The .row-delete-button rules probably should live somewherei
On 2013/05/30 21:14:55, Dan Beam wrote:
> s/somewherei/somewhere/

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File chrome/browser/resources/extensions/chromeos/kiosk_apps.js (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/chromeos/kiosk_apps.js:25: initializePage:
function() {
On 2013/05/30 21:14:55, Dan Beam wrote:
> same

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/chromeos/kiosk_apps.js:89: *         apps:
!Array.<Object>,
On 2013/05/30 21:14:55, Dan Beam wrote:
> @param {!Object.<{apps: !Array.<!Object>, disableBailout: boolean}>}

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File chrome/browser/resources/extensions/extensions.html (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/extensions.html:47: <if
expr="pp_ifdef('chromeos')">
On 2013/05/30 21:14:55, Dan Beam wrote:
> nit: no indent, like with #if
> 
>     <include ...
> <if expr="pp_ifdef('chromeos')">
>     <include ...

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/extensions.html:78: <if
expr="pp_ifdef('chromeos')">
On 2013/05/30 21:14:55, Dan Beam wrote:
> same

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
File chrome/browser/resources/extensions/extensions.js (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/resources/e...
chrome/browser/resources/extensions/extensions.js:132:
extensions.KioskDisableBailoutConfirm.getInstance();
On 2013/05/30 21:14:55, Dan Beam wrote:
> nit: extensions.KioskDisableBailoutConfirm.getInstance().initializePage();

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
File chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_browsertest.js
(right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_browsertest.js:21: * Mock
settings data.
On 2013/05/30 21:14:55, Dan Beam wrote:
> @private

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
File chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc (right):

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc:125:
!CommandLine::ForCurrentProcess()->HasSwitch(
On 2013/05/30 21:14:55, Dan Beam wrote:
> nit: indent off

Done.

https://codereview.chromium.org/15966004/diff/6001/chrome/browser/ui/webui/ex...
chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc:176:
l10n_util::GetStringUTF16(IDS_DONE));
On 2013/05/30 21:14:55, Dan Beam wrote:
> nit: this could probably fit in one line

Done.

[Dan Beam, 2013-05-30 23:17:43]

lgtm

https://codereview.chromium.org/15966004/diff/14001/chrome/browser/ui/webui/e...
File chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc (right):

https://codereview.chromium.org/15966004/diff/14001/chrome/browser/ui/webui/e...
chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc:128:
!base::chromeos::IsRunningOnChromeOS()));
nit: -1 \s on L125-128

[xiyuan, 2013-05-30 23:23:33]

https://codereview.chromium.org/15966004/diff/14001/chrome/browser/ui/webui/e...
File chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc (right):

https://codereview.chromium.org/15966004/diff/14001/chrome/browser/ui/webui/e...
chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc:128:
!base::chromeos::IsRunningOnChromeOS()));
On 2013/05/30 23:17:43, Dan Beam wrote:
> nit: -1 \s on L125-128

Finally get what you mean. :)

[commit-bot: I haz the power, 2013-05-30 23:24:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/xiyuan@chromium.org/15966004/18002

[commit-bot: I haz the power, 2013-05-31 03:47:39]

Change committed as 203327