Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: extensions/browser/api/networking_private/networking_private_chromeos.h

Issue 1283613005: Add networkingPrivate.getThirdPartyVpnProviderList (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_515987_cr_network_list
Patch Set: Rebase Created 5 years, 4 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
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 dd511f9fd4ef53f11ee428bc8c930e45fec9c08a..7193437fed90b2b84875e20eae5989c99d4a2fb2 100644
--- a/extensions/browser/api/networking_private/networking_private_chromeos.h
+++ b/extensions/browser/api/networking_private/networking_private_chromeos.h
@@ -5,10 +5,13 @@
#ifndef EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_CHROMEOS_H_
#define EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_CHROMEOS_H_
+#include "base/memory/linked_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "base/values.h"
#include "extensions/browser/api/networking_private/networking_private_delegate.h"
-namespace context {
+namespace content {
class BrowserContext;
}
@@ -87,8 +90,24 @@ class NetworkingPrivateChromeOS : public NetworkingPrivateDelegate {
bool EnableNetworkType(const std::string& type) override;
bool DisableNetworkType(const std::string& type) override;
bool RequestScan() override;
+ scoped_ptr<base::ListValue> GetThirdPartyVpnProviderList() override;
private:
+ // Callback for both GetProperties and GetManagedProperties. Copies
+ // |dictionary| and appends any networkingPrivate API specific properties,
+ // then calls |callback| with the result.
+ void GetPropertiesCallback(
+ const NetworkingPrivateDelegate::DictionaryCallback& callback,
+ const std::string& service_path,
+ const base::DictionaryValue& dictionary);
+
+ // Populate ThirdPartyVPN.Name with the provider name for third-party VPNs.
+ // The provider name needs to be looked up from the list of extensions which
+ // is not available to the chromeos/network module.
+ void AppendThirdPartyProviderName(base::DictionaryValue* dictionary);
+
+ // Handles connection failures, possibly showing UI for configuration
+ // failures, then calls the appropriate callback.
void ConnectFailureCallback(const std::string& guid,
const VoidCallback& success_callback,
const FailureCallback& failure_callback,

Powered by Google App Engine
This is Rietveld 408576698