Commit 0bb5b86a authored by Xiyuan Xia's avatar Xiyuan Xia Committed by Commit Bot

kiosk: Tighten cert manager UI

- No "Servers" and "Authorities" tab;
- No "Import" as in previous non-MD impl;

Bug: 719907
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Ie6fc8e7b257937b4e0607e426d9b0550dc2ddd4b
Reviewed-on: https://chromium-review.googlesource.com/820638Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523267}
parent 2ad2c1b1
...@@ -48,6 +48,10 @@ CertificateManagerDialogUI::CertificateManagerDialogUI(content::WebUI* web_ui) ...@@ -48,6 +48,10 @@ CertificateManagerDialogUI::CertificateManagerDialogUI(content::WebUI* web_ui)
"isGuest", "isGuest",
user_manager::UserManager::Get()->IsLoggedInAsGuest() || user_manager::UserManager::Get()->IsLoggedInAsGuest() ||
user_manager::UserManager::Get()->IsLoggedInAsPublicAccount()); user_manager::UserManager::Get()->IsLoggedInAsPublicAccount());
source->AddBoolean(
"isKiosk",
user_manager::UserManager::Get()->IsLoggedInAsKioskApp() ||
user_manager::UserManager::Get()->IsLoggedInAsArcKioskApp());
source->SetJsonPath("strings.js"); source->SetJsonPath("strings.js");
source->SetDefaultResource(IDR_CERT_MANAGER_DIALOG_HTML); source->SetDefaultResource(IDR_CERT_MANAGER_DIALOG_HTML);
......
...@@ -31,6 +31,15 @@ Polymer({ ...@@ -31,6 +31,15 @@ Polymer({
loadTimeData.getBoolean('isGuest'); loadTimeData.getBoolean('isGuest');
}, },
}, },
/** @private */
isKiosk_: {
type: Boolean,
value: function() {
return loadTimeData.valueExists('isKiosk') &&
loadTimeData.getBoolean('isKiosk');
},
},
}, },
behaviors: [I18nBehavior], behaviors: [I18nBehavior],
...@@ -62,7 +71,7 @@ Polymer({ ...@@ -62,7 +71,7 @@ Polymer({
* @private * @private
*/ */
canImport_: function() { canImport_: function() {
return this.certificateType != CertificateType.OTHER; return !this.isKiosk_ && this.certificateType != CertificateType.OTHER;
}, },
// <if expr="chromeos"> // <if expr="chromeos">
......
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html">
<link rel="import" href="chrome://resources/html/assert.html"> <link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<dom-module id="certificate-manager"> <dom-module id="certificate-manager">
<template> <template>
<style> <style include="cr-hidden-style">
:host { :host {
--paper-tabs-selection-bar-color: var(--paper-blue-500); --paper-tabs-selection-bar-color: var(--paper-blue-500);
} }
...@@ -65,8 +66,10 @@ ...@@ -65,8 +66,10 @@
<paper-tabs noink selected="{{selected}}"> <paper-tabs noink selected="{{selected}}">
<paper-tab>[[i18n('certificateManagerYourCertificates')]]</paper-tab> <paper-tab>[[i18n('certificateManagerYourCertificates')]]</paper-tab>
<paper-tab>[[i18n('certificateManagerServers')]]</paper-tab> <paper-tab hidden="[[isKiosk_]]">[[i18n('certificateManagerServers')]]
<paper-tab>[[i18n('certificateManagerAuthorities')]]</paper-tab> </paper-tab>
<paper-tab hidden="[[isKiosk_]]">[[i18n('certificateManagerAuthorities')]]
</paper-tab>
<paper-tab>[[i18n('certificateManagerOthers')]]</paper-tab> <paper-tab>[[i18n('certificateManagerOthers')]]</paper-tab>
</paper-tabs> </paper-tabs>
<iron-pages selected="[[selected]]"> <iron-pages selected="[[selected]]">
......
...@@ -96,6 +96,15 @@ Polymer({ ...@@ -96,6 +96,15 @@ Polymer({
* @private {?HTMLElement} * @private {?HTMLElement}
*/ */
activeDialogAnchor_: Object, activeDialogAnchor_: Object,
/** @private */
isKiosk_: {
type: Boolean,
value: function() {
return loadTimeData.valueExists('isKiosk') &&
loadTimeData.getBoolean('isKiosk');
},
},
}, },
/** @override */ /** @override */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment