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

Unified Diff: extensions/browser/api/networking_private/networking_private_api.cc

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_api.cc
diff --git a/extensions/browser/api/networking_private/networking_private_api.cc b/extensions/browser/api/networking_private/networking_private_api.cc
index f429462cb75b607e6b021aa4b2c849fb20b6bd39..bbcb2039c731f06371aa49f39725ccbc29f8dc74 100644
--- a/extensions/browser/api/networking_private/networking_private_api.cc
+++ b/extensions/browser/api/networking_private/networking_private_api.cc
@@ -15,8 +15,6 @@
namespace {
-const int kDefaultNetworkListLimit = 1000;
-
extensions::NetworkingPrivateDelegate* GetDelegate(
content::BrowserContext* browser_context) {
return extensions::NetworkingPrivateDelegateFactory::GetForBrowserContext(
@@ -31,7 +29,7 @@ namespace private_api = api::networking_private;
namespace networking_private {
-// static
+const int kDefaultNetworkListLimit = 1000;
const char kErrorInvalidNetworkGuid[] = "Error.InvalidNetworkGuid";
const char kErrorInvalidNetworkOperation[] = "Error.InvalidNetworkOperation";
const char kErrorNetworkUnavailable[] = "Error.NetworkUnavailable";
@@ -246,8 +244,9 @@ bool NetworkingPrivateGetNetworksFunction::RunAsync() {
params->filter.configured ? *params->filter.configured : false;
const bool visible_only =
params->filter.visible ? *params->filter.visible : false;
- const int limit =
- params->filter.limit ? *params->filter.limit : kDefaultNetworkListLimit;
+ const int limit = params->filter.limit
pneubeck (no reviews) 2015/08/13 12:58:37 orthogonal change?
+ ? *params->filter.limit
+ : networking_private::kDefaultNetworkListLimit;
GetDelegate(browser_context())
->GetNetworks(
@@ -286,7 +285,8 @@ bool NetworkingPrivateGetVisibleNetworksFunction::RunAsync() {
GetDelegate(browser_context())
->GetNetworks(
- network_type, configured_only, visible_only, kDefaultNetworkListLimit,
+ network_type, configured_only, visible_only,
+ networking_private::kDefaultNetworkListLimit,
base::Bind(&NetworkingPrivateGetVisibleNetworksFunction::Success,
this),
base::Bind(&NetworkingPrivateGetVisibleNetworksFunction::Failure,
@@ -770,4 +770,18 @@ void NetworkingPrivateSetCellularSimStateFunction::Failure(
SendResponse(false);
}
+////////////////////////////////////////////////////////////////////////////////
+// NetworkingPrivateGetThirdPartyVPNProvidersFunction
+
+NetworkingPrivateGetThirdPartyVPNProvidersFunction::
+ ~NetworkingPrivateGetThirdPartyVPNProvidersFunction() {}
+
+bool NetworkingPrivateGetThirdPartyVPNProvidersFunction::RunAsync() {
+ scoped_ptr<base::ListValue> vpn_provider_list =
+ GetDelegate(browser_context())->GetThirdPartyVpnProviderList();
+ SetResult(vpn_provider_list.release());
+ SendResponse(true);
+ return true;
+}
+
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698