chrome/browser/chromeos/settings/device_settings_provider.cc - Issue 1784333002: Add Device Policy Handler for Bluetooth, and allow disabling the Bluetooth adapter on Chrome OS

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/chromeos/settings/device_settings_provider.cc

Issue 1784333002: Add Device Policy Handler for Bluetooth, and allow disabling the Bluetooth adapter on Chrome OS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bartfab's nits Created 4 years, 8 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

« chrome/browser/chromeos/policy/bluetooth_policy_handler.cc ('K') | « chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_provider.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc

index bb5b2404673acb78bb38f4860ee4d236bf8eb95b..be2bb1e6b2aca45800199ad1932df8989a50706c 100644

--- a/chrome/browser/chromeos/settings/device_settings_provider.cc

+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc

@@ -457,10 +457,13 @@ void DecodeGenericPolicies(

policy.display_rotation_default().display_rotation_default());

}

- new_values_cache->SetBoolean(

- kAllowBluetooth, policy.has_allow_bluetooth() &&

- policy.allow_bluetooth().has_allow_bluetooth() &&

- policy.allow_bluetooth().allow_bluetooth());

+ if (policy.has_allow_bluetooth() &&

+ policy.allow_bluetooth().has_allow_bluetooth()) {

+ new_values_cache->SetBoolean(kAllowBluetooth,

+ policy.allow_bluetooth().allow_bluetooth());

+ } else {

+ new_values_cache->SetBoolean(kAllowBluetooth, true);

+ }

if (policy.has_quirks_download_enabled() &&

policy.quirks_download_enabled().has_quirks_download_enabled()) {