chrome/browser/extensions/api/settings_private/prefs_util.cc - 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/extensions/api/settings_private/prefs_util.cc

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/chromeos/settings/stub_cros_settings_provider.cc ('k') | chrome/browser/resources/settings/advanced_page/advanced_page.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/settings_private/prefs_util.cc

diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc

index b5b4a8b2d9d0a5aab38d12cbef35fddf16b9ea50..593aac02eb8528744ab4751a74df44154fb1ced4 100644

--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc

+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc

@@ -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());