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

Unified Diff: chromeos/network/managed_network_configuration_handler.cc

Issue 14566009: Add NetworkConnectionHandler class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modify Shill stubs Created 7 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: chromeos/network/managed_network_configuration_handler.cc
diff --git a/chromeos/network/managed_network_configuration_handler.cc b/chromeos/network/managed_network_configuration_handler.cc
index a7e7d628bad2d154c118aa7229947514c560c64e..75b7668de33ab86b0b367cf40321bc4f0e3879fc 100644
--- a/chromeos/network/managed_network_configuration_handler.cc
+++ b/chromeos/network/managed_network_configuration_handler.cc
@@ -126,7 +126,7 @@ void IgnoreString(const std::string& str) {
void LogErrorWithDict(const tracked_objects::Location& from_where,
const std::string& error_name,
- const scoped_ptr<base::DictionaryValue> error_data) {
+ scoped_ptr<base::DictionaryValue> error_data) {
LOG(ERROR) << from_where.ToString() << ": " << error_name;
}
@@ -228,7 +228,7 @@ scoped_ptr<base::DictionaryValue> CreateShillConfiguration(
scoped_ptr<NetworkUIData> ui_data;
if (policy)
- ui_data = CreateUIDataFromONC(onc_source, *policy);
+ ui_data = NetworkUIData::CreateUIDataFromONC(onc_source, *policy);
else
ui_data.reset(new NetworkUIData());
@@ -512,24 +512,6 @@ void ManagedNetworkConfigurationHandler::SetProperties(
error_callback);
}
-void ManagedNetworkConfigurationHandler::Connect(
- const std::string& service_path,
- const base::Closure& callback,
- const network_handler::ErrorCallback& error_callback) const {
- NetworkConfigurationHandler::Get()->Connect(service_path,
- callback,
- error_callback);
-}
-
-void ManagedNetworkConfigurationHandler::Disconnect(
- const std::string& service_path,
- const base::Closure& callback,
- const network_handler::ErrorCallback& error_callback) const {
- NetworkConfigurationHandler::Get()->Disconnect(service_path,
- callback,
- error_callback);
-}
-
void ManagedNetworkConfigurationHandler::CreateConfiguration(
const base::DictionaryValue& properties,
const network_handler::StringResultCallback& callback,

Powered by Google App Engine
This is Rietveld 408576698