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

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

Issue 2676103002: MD Settings: Move bluetooth UI from dialog to subpage (Closed)
Patch Set: Feedback Created 3 years, 10 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/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
7 <link rel="import" href="../i18n_setup.html"> 8 <link rel="import" href="../i18n_setup.html">
8 <link rel="import" href="../icons.html"> 9 <link rel="import" href="../icons.html">
9 <link rel="import" href="../prefs/prefs.html"> 10 <link rel="import" href="../prefs/prefs.html">
10 <link rel="import" href="../settings_page/settings_animated_pages.html"> 11 <link rel="import" href="../settings_page/settings_animated_pages.html">
11 <link rel="import" href="../settings_page/settings_subpage.html"> 12 <link rel="import" href="../settings_page/settings_subpage.html">
12 <link rel="import" href="../settings_shared_css.html"> 13 <link rel="import" href="../settings_shared_css.html">
13 <link rel="import" href="bluetooth_subpage.html"> 14 <link rel="import" href="bluetooth_subpage.html">
14 15
15 <dom-module id="settings-bluetooth-page"> 16 <dom-module id="settings-bluetooth-page">
16 <template> 17 <template>
17 <style include="settings-shared"> 18 <style include="settings-shared">
18 </style> 19 </style>
19 <settings-animated-pages id="pages" section="bluetooth"> 20 <settings-animated-pages id="pages" section="bluetooth">
20 <neon-animatable route-path="default"> 21 <neon-animatable route-path="default">
21 <div class="settings-box first" actionable on-tap="onTap_"> 22 <div class="settings-box two-line" actionable on-tap="onTap_">
22 <iron-icon icon="[[getIcon_(bluetoothEnabled_)]]"></iron-icon> 23 <iron-icon icon="[[getIcon_(bluetoothEnabled_)]]"></iron-icon>
23 <span class="middle">[[getTitle_(bluetoothEnabled_)]]</span> 24 <div class="middle">
25 <div>$i18n{bluetoothPageTitle}</div>
26 <div class="secondary">[[getDescription_(bluetoothEnabled_)]]</div>
27 </div>
24 <cr-policy-pref-indicator 28 <cr-policy-pref-indicator
25 pref="[[prefs.cros.device.allow_bluetooth]]" 29 pref="[[prefs.cros.device.allow_bluetooth]]"
26 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> 30 hidden="[[prefs.cros.device.allow_bluetooth.value]]">
27 </cr-policy-pref-indicator> 31 </cr-policy-pref-indicator>
28 <button class="subpage-arrow" is="paper-icon-button-light" 32 <button class="subpage-arrow" is="paper-icon-button-light"
29 on-tap="onSubpageArrowTap_"> 33 on-tap="onSubpageArrowTap_">
30 </button> 34 </button>
35 <div class="secondary-action">
36 <paper-toggle-button id="enableBluetooth"
37 checked="{{bluetoothEnabled_}}"
38 disabled="[[!adapterState_.available]]" on-tap="stopTap_">
39 </paper-toggle-button>
40 </div>
31 </div> 41 </div>
32 </neon-animatable> 42 </neon-animatable>
33 43
34 <template is="dom-if" route-path="/bluetoothDevices"> 44 <template is="dom-if" route-path="/bluetoothDevices">
35 <settings-subpage associated-control="[[$$('#bluetoothDevices')]]" 45 <settings-subpage associated-control="[[$$('#bluetoothDevices')]]"
36 page-title="$i18n{bluetoothPageTitle}" 46 page-title="$i18n{bluetoothPageTitle}">
37 show-spinner="[[showSpinner_]]">
38 <settings-bluetooth-subpage 47 <settings-bluetooth-subpage
39 adapter-state="[[adapterState_]]" 48 adapter-state="[[adapterState_]]"
40 bluetooth-enabled="{{bluetoothEnabled_}}" 49 bluetooth-enabled="{{bluetoothEnabled_}}"
41 bluetooth="[[bluetooth]]" 50 bluetooth="[[bluetooth]]"
42 bluetooth-private="[[bluetoothPrivate]]" 51 bluetooth-private="[[bluetoothPrivate]]">
43 show-spinner="{{showSpinner_}}">
44 </settings-bluetooth-subpage> 52 </settings-bluetooth-subpage>
45 </settings-subpage> 53 </settings-subpage>
46 </template> 54 </template>
47 55
48 </settings-animated-pages> 56 </settings-animated-pages>
49 </template> 57 </template>
50 <script src="bluetooth_page.js"></script> 58 <script src="bluetooth_page.js"></script>
51 </dom-module> 59 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698