Index: chromeos/network/network_activation_handler.cc |
diff --git a/chromeos/network/network_activation_handler.cc b/chromeos/network/network_activation_handler.cc |
index 90ed374382b00d8f8ac189d87688f6f93a438fab..9980bc0bcc3c8031ff9874f7f98c20d628714457 100644 |
--- a/chromeos/network/network_activation_handler.cc |
+++ b/chromeos/network/network_activation_handler.cc |
@@ -10,7 +10,9 @@ |
#include "chromeos/dbus/shill_service_client.h" |
#include "chromeos/network/network_event_log.h" |
#include "chromeos/network/network_handler.h" |
+#include "chromeos/network/network_state.h" |
#include "dbus/object_proxy.h" |
+#include "third_party/cros_system_api/dbus/service_constants.h" |
namespace chromeos { |
@@ -37,6 +39,13 @@ void NetworkActivationHandler::CompleteActivation( |
CallShillCompleteActivation(service_path, success_callback, error_callback); |
} |
+bool NetworkActivationHandler::NetworkRequiresActivation( |
+ const NetworkState* network) { |
+ return (network->type() == flimflam::kTypeCellular && |
+ network->activation_state() != flimflam::kActivationStateActivated && |
+ network->activation_state() != flimflam::kActivationStateUnknown); |
stevenjb
2013/09/13 18:28:53
Since this takes a NetworkState* and only uses Net
armansito
2013/09/16 21:19:20
Done.
|
+} |
+ |
void NetworkActivationHandler::CallShillActivate( |
const std::string& service_path, |
const std::string& carrier, |