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

Unified Diff: chromeos/network/network_configuration_handler.h

Issue 917053002: Add Source property to networkingPrivate.getState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase with separated test expectations Created 5 years, 10 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: chromeos/network/network_configuration_handler.h
diff --git a/chromeos/network/network_configuration_handler.h b/chromeos/network/network_configuration_handler.h
index 4b404d8a9c42898229ebb505c3deb771950c538c..aa77ef28230868a559a7b32852a3dda154d24b9e 100644
--- a/chromeos/network/network_configuration_handler.h
+++ b/chromeos/network/network_configuration_handler.h
@@ -66,10 +66,9 @@ class CHROMEOS_EXPORT NetworkConfigurationHandler
// Gets the properties of the network with id |service_path|. See note on
// |callback| and |error_callback|, in class description above.
- void GetProperties(
- const std::string& service_path,
- const network_handler::DictionaryResultCallback& callback,
- const network_handler::ErrorCallback& error_callback) const;
+ void GetProperties(const std::string& service_path,
+ const network_handler::DictionaryResultCallback& callback,
+ const network_handler::ErrorCallback& error_callback);
// Sets the properties of the network with id |service_path|. This means the
// given properties will be merged with the existing settings, and it won't
@@ -159,7 +158,15 @@ class CHROMEOS_EXPORT NetworkConfigurationHandler
NetworkConfigurationObserver::Source source,
const base::Closure& callback);
- // Invoke the callback and inform NetworkStateHandler to request an update
+ // Set the Name and GUID properties correctly and Invoke |callback|.
+ void GetPropertiesCallback(
+ const network_handler::DictionaryResultCallback& callback,
+ const network_handler::ErrorCallback& error_callback,
+ const std::string& service_path,
+ DBusMethodCallStatus call_status,
+ const base::DictionaryValue& properties);
+
+ // Invoke |callback| and inform NetworkStateHandler to request an update
// for the service after setting properties.
void SetPropertiesSuccessCallback(
const std::string& service_path,
@@ -172,7 +179,7 @@ class CHROMEOS_EXPORT NetworkConfigurationHandler
const std::string& dbus_error_name,
const std::string& dbus_error_message);
- // Invoke the callback and inform NetworkStateHandler to request an update
+ // Invoke |callback| and inform NetworkStateHandler to request an update
// for the service after clearing properties.
void ClearPropertiesSuccessCallback(
const std::string& service_path,

Powered by Google App Engine
This is Rietveld 408576698