chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html - Issue 2143823002: MD Settings: Bluetooth: Show policy indicator when disabled by policy

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

Issue 2143823002: MD Settings: Bluetooth: Show policy indicator when disabled by policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_602538_bluetooth_fixes_1

Patch Set: Fix tests Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/advanced_page/advanced_page.html ('k') | chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

index 0f217e18b392bdb2250329a55040fb5fc13bb884..85565345cc6c5e55bea30bd3e0d6370cf6fbc622 100644

--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

@@ -6,6 +6,7 @@

+<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">

@@ -55,6 +56,10 @@

disabled="[[!adapterState.available]]"

on-change="onBluetoothEnabledChange_">

</paper-toggle-button>

+ <cr-policy-pref-indicator

+ pref="[[prefs.cros.device.allow_bluetooth]]"

+ hidden="[[prefs.cros.device.allow_bluetooth.value]]">

+ </cr-policy-pref-indicator>

</div>

<iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled,