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

Side by Side Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

Issue 2849663002: [MD settings] replace secondary-action with separator (Closed)
Patch Set: merge with master Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> 1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
6 <link rel="import" href="../i18n_setup.html"> 6 <link rel="import" href="../i18n_setup.html">
7 <link rel="import" href="../icons.html"> 7 <link rel="import" href="../icons.html">
8 <link rel="import" href="../prefs/prefs.html"> 8 <link rel="import" href="../prefs/prefs.html">
9 <link rel="import" href="../settings_page/settings_animated_pages.html"> 9 <link rel="import" href="../settings_page/settings_animated_pages.html">
10 <link rel="import" href="../settings_page/settings_subpage.html"> 10 <link rel="import" href="../settings_page/settings_subpage.html">
(...skipping 21 matching lines...) Expand all
32 pref="[[prefs.cros.device.allow_bluetooth]]" 32 pref="[[prefs.cros.device.allow_bluetooth]]"
33 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> 33 hidden="[[prefs.cros.device.allow_bluetooth.value]]">
34 </cr-policy-pref-indicator> 34 </cr-policy-pref-indicator>
35 <template is="dom-if" if="[[bluetoothToggleState_]]"> 35 <template is="dom-if" if="[[bluetoothToggleState_]]">
36 <button class="subpage-arrow" is="paper-icon-button-light" 36 <button class="subpage-arrow" is="paper-icon-button-light"
37 on-tap="onSubpageArrowTap_" 37 on-tap="onSubpageArrowTap_"
38 aria-label="$i18n{bluetoothPageTitle}" 38 aria-label="$i18n{bluetoothPageTitle}"
39 aria-describedby="bluetoothSecondary"> 39 aria-describedby="bluetoothSecondary">
40 </button> 40 </button>
41 </template> 41 </template>
42 <div class="secondary-action"> 42 <div class="separator"></div>
43 <paper-toggle-button id="enableBluetooth" 43 <paper-toggle-button id="enableBluetooth"
44 checked="{{bluetoothToggleState_}}" 44 checked="{{bluetoothToggleState_}}"
45 disabled$="[[bluetoothToggleDisabled_]]" on-tap="stopTap_" 45 disabled$="[[bluetoothToggleDisabled_]]" on-tap="stopTap_"
46 aria-label="$i18n{bluetoothToggleA11yLabel}"> 46 aria-label="$i18n{bluetoothToggleA11yLabel}">
47 </paper-toggle-button> 47 </paper-toggle-button>
48 </div>
49 </div> 48 </div>
50 </neon-animatable> 49 </neon-animatable>
51 50
52 <template is="dom-if" route-path="/bluetoothDevices"> 51 <template is="dom-if" route-path="/bluetoothDevices">
53 <settings-subpage associated-control="[[$$('#bluetoothDevices')]]" 52 <settings-subpage associated-control="[[$$('#bluetoothDevices')]]"
54 page-title="$i18n{bluetoothPageTitle}"> 53 page-title="$i18n{bluetoothPageTitle}">
55 <settings-bluetooth-subpage 54 <settings-bluetooth-subpage
56 adapter-state="[[adapterState_]]" 55 adapter-state="[[adapterState_]]"
57 bluetooth-toggle-state="{{bluetoothToggleState_}}" 56 bluetooth-toggle-state="{{bluetoothToggleState_}}"
58 bluetooth-toggle-disabled="[[bluetoothToggleDisabled_]]" 57 bluetooth-toggle-disabled="[[bluetoothToggleDisabled_]]"
59 bluetooth="[[bluetooth]]" 58 bluetooth="[[bluetooth]]"
60 bluetooth-private="[[bluetoothPrivate]]"> 59 bluetooth-private="[[bluetoothPrivate]]">
61 </settings-bluetooth-subpage> 60 </settings-bluetooth-subpage>
62 </settings-subpage> 61 </settings-subpage>
63 </template> 62 </template>
64 63
65 </settings-animated-pages> 64 </settings-animated-pages>
66 </template> 65 </template>
67 <script src="bluetooth_page.js"></script> 66 <script src="bluetooth_page.js"></script>
68 </dom-module> 67 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698