| Index: chrome/utility/networking_private_handler.h
|
| diff --git a/chrome/utility/networking_private_handler.h b/chrome/utility/networking_private_handler.h
|
| index 2328b9ef349235c7993ca1d9798a38899e3eef4b..181c38ca8904ff01cc57e3c4cb79e97b0efd177e 100644
|
| --- a/chrome/utility/networking_private_handler.h
|
| +++ b/chrome/utility/networking_private_handler.h
|
| @@ -44,15 +44,15 @@ class NetworkingPrivateHandler : public UtilityMessageHandler {
|
| // Sends |NetworkingPrivateMsg_API_Error| back to browser process.
|
| // |message_id| is used to by NetworkingPrivateProcessClient to find matching
|
| // request.
|
| - void OnApiError(int message_id,
|
| - const std::string& error_name,
|
| - scoped_ptr<base::DictionaryValue> error_data);
|
| + void WiFiApiError(int message_id,
|
| + const std::string& error_name,
|
| + scoped_ptr<base::DictionaryValue> error_data);
|
|
|
| // Get properties of network identified by |network_guid|.
|
| void OnGetPropertiesStart(int message_id, const std::string& network_guid);
|
|
|
| // Callback from |WiFiService| to send |properties| back to browser process.
|
| - void OnGetPropertiesSucceeded(
|
| + void WiFiGetPropertiesSucceeded(
|
| int message_id,
|
| const std::string& network_guid,
|
| const WiFiService::NetworkProperties& properties);
|
| @@ -64,7 +64,7 @@ class NetworkingPrivateHandler : public UtilityMessageHandler {
|
|
|
| // Callback from |WiFiService| to report set properties success back to
|
| // browser process.
|
| - void OnSetPropertiesSucceeded(int message_id,
|
| + void WiFiSetPropertiesSucceeded(int message_id,
|
| const std::string& network_guid);
|
|
|
| // Start connect to network identified by |network_guid|. Does not wait for
|
| @@ -75,7 +75,8 @@ class NetworkingPrivateHandler : public UtilityMessageHandler {
|
| // Callback from |WiFiService| to report start connect success back to
|
| // browser process. Does not wait for connect to actually succeed. If/When
|
| // connect succeeds the |NetworksChanged| event will be generated.
|
| - void OnStartConnectSucceeded(int message_id, const std::string& network_guid);
|
| + void WiFiStartConnectSucceeded(int message_id,
|
| + const std::string& network_guid);
|
|
|
| // Start disconnect from network identified by |network_guid|. Does not wait
|
| // for disconnect to succeed.
|
| @@ -84,30 +85,30 @@ class NetworkingPrivateHandler : public UtilityMessageHandler {
|
| // Callback from |WiFiService| to report start disconnect success back to
|
| // browser process. Does not wait for disconnect to actually succeed. If/When
|
| // disconnect succeeds the |NetworksChanged| event will be generated.
|
| - void OnStartDisconnectSucceeded(int message_id,
|
| - const std::string& network_guid);
|
| + void WiFiStartDisconnectSucceeded(int message_id,
|
| + const std::string& network_guid);
|
|
|
| // Request network scan. Does not wait for scan to complete.
|
| void OnRequestNetworkScan();
|
|
|
| // Callback from |WiFiService| to report that network scan has succeded.
|
| // Generates |NetworkListChanged| event based on current |network_list|.
|
| - void OnNetworkScanSucceeded(const WiFiService::NetworkList& network_list);
|
| + void WiFiNetworkScanSucceeded(const WiFiService::NetworkList& network_list);
|
|
|
| // Get current list of visible networks.
|
| void OnGetVisibleNetworks(int message_id);
|
|
|
| // Callback from |WiFiService| to report list of visible networks.
|
| - void OnGetVisibleNetworksSucceeded(
|
| + void WiFiGetVisibleNetworksSucceeded(
|
| int message_id,
|
| const WiFiService::NetworkList& network_list);
|
|
|
| // Send |NetworkListChanged| event with |network_guid_list|.
|
| - void OnNetworkListChangedEvent(
|
| + void WiFiNetworkListChangedEvent(
|
| const WiFiService::NetworkGuidList& network_guid_list);
|
|
|
| // Send |NetworksChanged| event with |network_guid_list|.
|
| - void OnNetworksChangedEvent(
|
| + void WiFiNetworksChangedEvent(
|
| const WiFiService::NetworkGuidList& network_guid_list);
|
|
|
| // Platform-specific WiFi service.
|
|
|