Chromium Code Reviews| Index: extensions/browser/api/networking_private/networking_private_chromeos.cc |
| diff --git a/extensions/browser/api/networking_private/networking_private_chromeos.cc b/extensions/browser/api/networking_private/networking_private_chromeos.cc |
| index 0e2e6d7671ed2d2ff7135b53e5c9495c1832f746..9e5f0c3208c48fc0967a7712463e6f7838690ebb 100644 |
| --- a/extensions/browser/api/networking_private/networking_private_chromeos.cc |
| +++ b/extensions/browser/api/networking_private/networking_private_chromeos.cc |
| @@ -673,6 +673,17 @@ NetworkingPrivateChromeOS::GetDeviceStateList() { |
| return device_state_list; |
| } |
| +std::unique_ptr<base::DictionaryValue> |
| +NetworkingPrivateChromeOS::GetGlobalPolicy() { |
| + auto result = base::MakeUnique<base::DictionaryValue>(); |
| + const base::DictionaryValue* global_network_config = |
| + GetManagedConfigurationHandler()->GetGlobalConfigFromPolicy( |
|
tbarzic
2017/01/06 22:43:18
Why not return |global_network_config directly| an
stevenjb
2017/01/09 19:30:37
GetGlobalConfigFromPolicy returns a const*, so we
tbarzic
2017/01/09 20:24:30
Wouldn't something like the following avoid this e
stevenjb
2017/01/09 20:43:34
We can't call RespondNow from the delegate, and I
tbarzic
2017/01/09 21:11:07
That snippet would be networking_private_api.cc co
|
| + std::string() /* no username hash, device policy */); |
| + if (global_network_config) |
| + result->MergeDictionary(global_network_config); |
| + return result; |
| +} |
| + |
| bool NetworkingPrivateChromeOS::EnableNetworkType(const std::string& type) { |
| NetworkTypePattern pattern = |
| chromeos::onc::NetworkTypePatternFromOncType(type); |