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

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

Issue 1059033002: Implement networkingPrivate.getDeviceStates (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test Created 5 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
Index: extensions/browser/api/networking_private/networking_private_service_client.cc
diff --git a/extensions/browser/api/networking_private/networking_private_service_client.cc b/extensions/browser/api/networking_private/networking_private_service_client.cc
index 9859b5e4682f1d6ab2053d687f7dcd2767793118..6185540bd69bf6dc13eae58a23f1bba9bac03bd7 100644
--- a/extensions/browser/api/networking_private/networking_private_service_client.cc
+++ b/extensions/browser/api/networking_private/networking_private_service_client.cc
@@ -11,7 +11,6 @@
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/api/networking_private/networking_private_api.h"
#include "extensions/browser/api/networking_private/networking_private_delegate_observer.h"
-#include "extensions/common/api/networking_private.h"
using content::BrowserThread;
using wifi::WiFiService;
@@ -313,9 +312,21 @@ void NetworkingPrivateServiceClient::GetCaptivePortalStatus(
scoped_ptr<base::ListValue>
NetworkingPrivateServiceClient::GetEnabledNetworkTypes() {
scoped_ptr<base::ListValue> network_list;
+ network_list->AppendString(::onc::network_type::kWiFi);
return network_list.Pass();
}
+scoped_ptr<DeviceStateList>
+NetworkingPrivateServiceClient::GetDeviceStateList() {
+ scoped_ptr<DeviceStateList> device_state_list(new DeviceStateList);
+ scoped_ptr<core_api::networking_private::DeviceStateProperties> properties(
+ new core_api::networking_private::DeviceStateProperties);
+ properties->type = core_api::networking_private::NETWORK_TYPE_WIFI;
+ properties->state = core_api::networking_private::DEVICE_STATE_TYPE_ENABLED;
+ device_state_list->push_back(properties.Pass());
+ return device_state_list.Pass();
+}
+
bool NetworkingPrivateServiceClient::EnableNetworkType(
const std::string& type) {
return false;

Powered by Google App Engine
This is Rietveld 408576698