diff options
Diffstat (limited to 'chromium/chrome/browser/resources/md_extensions/toolbar.html')
| -rw-r--r-- | chromium/chrome/browser/resources/md_extensions/toolbar.html | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/chromium/chrome/browser/resources/md_extensions/toolbar.html b/chromium/chrome/browser/resources/md_extensions/toolbar.html index 20d8d952a80..c57b165e06f 100644 --- a/chromium/chrome/browser/resources/md_extensions/toolbar.html +++ b/chromium/chrome/browser/resources/md_extensions/toolbar.html @@ -1,19 +1,18 @@ <link rel="import" href="chrome://resources/html/polymer.html"> +<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html"> <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.html"> <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/paper_button_style_css.html"> -<link rel="import" href="chrome://resources/cr_elements/paper_toggle_style_css.html"> <link rel="import" href="chrome://resources/html/assert.html"> <link rel="import" href="chrome://resources/html/cr.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html"> -<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html"> -<link rel="import" href="chrome://extensions/icons.html"> +<link rel="import" href="icons.html"> <link rel="stylesheet" href="chrome://resources/css/md_colors.css"> <dom-module id="extensions-toolbar"> <template> - <style include="cr-hidden-style paper-button-style paper-toggle-style"> + <style include="cr-hidden-style paper-button-style"> :host { --toolbar-width: 580px; --toolbar-color: var(--md-toolbar-color); @@ -25,15 +24,11 @@ } /* This toggle needs special styling because it's on blue background. */ - cr-toolbar paper-toggle-button { - --paper-toggle-button-checked-bar: { - @apply(--cr-toggle-bar-size); - opacity: 0.5; - }; - --paper-toggle-button-checked-bar-color: white; - --paper-toggle-button-checked-button-color: white; - --paper-toggle-button-checked-ink-color: white; - --paper-toggle-button-unchecked-ink-color: white; + cr-toolbar cr-toggle { + --cr-toggle-checked-bar-color: white; + --cr-toggle-checked-button-color: white; + --cr-toggle-checked-ink-color: white; + --cr-toggle-unchecked-ink-color: white; } .dev-controls { @@ -66,16 +61,16 @@ -webkit-margin-end: 16px; } </style> - <cr-toolbar class="paper-header" - page-name="$i18n{toolbarTitle}" + <cr-toolbar page-name="$i18n{toolbarTitle}" search-prompt="$i18n{search}" clear-label="$i18n{clearSearch}" - show-menu> - <div class="more-actions"> - <span>$i18n{toolbarDevMode}</span> - <paper-toggle-button id="dev-mode" on-change="onDevModeChange_" - checked="[[inDevMode]]"> - </paper-toggle-button> + menu-label="$i18n{mainMenu}" + show-menu="[[!isGuest]]" show-search="[[!isGuest]]"> + <div class="more-actions" hidden$="[[isGuest]]"> + <span id="devModeLabel">$i18n{toolbarDevMode}</span> + <cr-toggle id="dev-mode" on-change="onDevModeChange_" + checked="[[inDevMode]]" aria-labelledby="devModeLabel"> + </cr-toggle> </div> </cr-toolbar> <div class="dev-controls" hidden$="[[!inDevMode]]"> @@ -89,8 +84,14 @@ <paper-button id="update-now" on-tap="onUpdateNowTap_"> $i18n{toolbarUpdateNow} </paper-button> +<if expr="chromeos"> + <paper-button id="kiosk-extensions" on-tap="onKioskTap_" + hidden$="[[!kioskEnabled]]"> + $i18n{manageKioskApp} + </paper-button> +</if> </div> </div> </template> - <script src="chrome://extensions/toolbar.js"></script> + <script src="toolbar.js"></script> </dom-module> |