Commit 4ca26c82 authored by stevenjb's avatar stevenjb Committed by Commit bot

MD Settings: Bluetooth: Show policy indicator when disabled by policy

BUG=612846
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation;master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2143823002
Cr-Commit-Position: refs/heads/master@{#406662}
parent fe4a30b0
......@@ -68,6 +68,7 @@ void StubCrosSettingsProvider::SetDefaults() {
values_.SetBoolean(kAccountsPrefSupervisedUsersEnabled, true);
values_.SetBoolean(kAccountsPrefShowUserNamesOnSignIn, true);
values_.SetValue(kAccountsPrefUsers, base::WrapUnique(new base::ListValue));
values_.SetBoolean(kAllowBluetooth, true);
values_.SetBoolean(kAttestationForContentProtectionEnabled, true);
values_.SetBoolean(kStatsReportingPref, true);
values_.SetValue(kAccountsPrefDeviceLocalAccounts,
......
......@@ -243,6 +243,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)["cros.metrics.reportingEnabled"] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)["cros.device.allow_bluetooth"] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)["cros.device.attestation_for_content_protection_enabled"] =
settings_private::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)["settings.internet.wake_on_wifi_darkconnect"] =
......@@ -331,7 +333,7 @@ std::unique_ptr<settings_private::PrefObject> PrefsUtil::GetCrosSettingsPref(
#if defined(OS_CHROMEOS)
const base::Value* value = CrosSettings::Get()->GetPref(name);
DCHECK(value);
DCHECK(value) << "Pref not found: " << name;
pref_object->key = name;
pref_object->type = GetType(name, value->GetType());
pref_object->value.reset(value->DeepCopy());
......
......@@ -48,7 +48,8 @@
<template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]" restamp>
<settings-section page-title="$i18n{bluetoothPageTitle}"
current-route="[[currentRoute]]" section="bluetooth">
<settings-bluetooth-page current-route="{{currentRoute}}">
<settings-bluetooth-page prefs="{{prefs}}"
current-route="{{currentRoute}}">
</settings-bluetooth-page>
</settings-section>
</template>
......
......@@ -6,6 +6,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
<link rel="import" href="/icons.html">
<link rel="import" href="/settings_page/settings_animated_pages.html">
<link rel="import" href="/settings_shared_css.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>
</div>
<iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled,
......
......@@ -95,6 +95,12 @@ Polymer({
/** The translated error message to show when a connect error occurs. */
errorMessage: String,
/** Preferences state. */
prefs: {
type: Object,
notify: true,
},
/**
* Interface for bluetooth calls. May be overriden by tests.
* @type {Bluetooth}
......
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