| Index: extensions/browser/api/networking_private/networking_private_chromeos.h
|
| diff --git a/extensions/browser/api/networking_private/networking_private_chromeos.h b/extensions/browser/api/networking_private/networking_private_chromeos.h
|
| index 9cf77ba755c8d261730f617de229c5770d4774e4..6e517f3e08dd70f24083db1b53817f9548d9648b 100644
|
| --- a/extensions/browser/api/networking_private/networking_private_chromeos.h
|
| +++ b/extensions/browser/api/networking_private/networking_private_chromeos.h
|
| @@ -100,7 +100,9 @@ class NetworkingPrivateChromeOS : public NetworkingPrivateDelegate {
|
| // Callback for both GetProperties and GetManagedProperties. Copies
|
| // |dictionary| and appends any networkingPrivate API specific properties,
|
| // then calls |callback| with the result.
|
| - void GetPropertiesCallback(const DictionaryCallback& callback,
|
| + void GetPropertiesCallback(const std::string& guid,
|
| + bool managed,
|
| + const DictionaryCallback& callback,
|
| const std::string& service_path,
|
| const base::DictionaryValue& dictionary);
|
|
|
| @@ -109,6 +111,10 @@ class NetworkingPrivateChromeOS : public NetworkingPrivateDelegate {
|
| // which is not available to the chromeos/network module.
|
| void AppendThirdPartyProviderName(base::DictionaryValue* dictionary);
|
|
|
| + // Sets the active proxy values in managed network configurations.
|
| + void SetManagedActiveProxyValues(const std::string& guid,
|
| + base::DictionaryValue* dictionary);
|
| +
|
| // Handles connection failures, possibly showing UI for configuration
|
| // failures, then calls the appropriate callback.
|
| void ConnectFailureCallback(
|
|
|