Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chromeos / network / shill_property_handler.cc

diff --git a/src/chromeos/network/shill_property_handler.cc b/src/chromeos/network/shill_property_handler.cc
index 4fe7114..5e3b6fc 100644 (file)
--- a/src/chromeos/network/shill_property_handler.cc
+++ b/src/chromeos/network/shill_property_handler.cc
@@ -87,7 +87,7 @@ class ShillPropertyObserver : public ShillPropertyChangedObserver {
 
   // ShillPropertyChangedObserver overrides.
   virtual void OnPropertyChanged(const std::string& key,
-                                 const base::Value& value) OVERRIDE {
+                                 const base::Value& value) override {
     handler_.Run(type_, path_, key, value);
   }
 
@@ -182,7 +182,20 @@ void ShillPropertyHandler::SetCheckPortalList(
       base::Bind(&base::DoNothing),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
                  "SetCheckPortalList Failed",
-                 "", network_handler::ErrorCallback()));
+                 "Manager",
+                 network_handler::ErrorCallback()));
+}
+
+void ShillPropertyHandler::SetWakeOnLanEnabled(bool enabled) {
+  base::FundamentalValue value(enabled);
+  shill_manager_->SetProperty(
+      shill::kWakeOnLanEnabledProperty,
+      value,
+      base::Bind(&base::DoNothing),
+      base::Bind(&network_handler::ShillErrorCallbackFunction,
+                 "SetWakeOnLanEnabled Failed",
+                 "Manager",
+                 network_handler::ErrorCallback()));
 }
 
 void ShillPropertyHandler::RequestScan() const {
@@ -520,8 +533,11 @@ void ShillPropertyHandler::GetIPConfigCallback(
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& properties)  {
   if (call_status != DBUS_METHOD_CALL_SUCCESS) {
-    NET_LOG_ERROR("Failed to get IP Config properties",
-                  base::StringPrintf("%s: %d", path.c_str(), call_status));
+    // IP Config properties not availabe. Shill will emit a property change
+    // when they are.
+    NET_LOG_EVENT(
+        base::StringPrintf("Failed to get IP Config properties: %s: %d",
+                           ip_config_path.c_str(), call_status), path);
     return;
   }
   NET_LOG_EVENT("IP Config properties received", path);