Add NetworkState::RequiresActivation.

chromeos/network/network_activation_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/network_activation_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #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 {
 
 // static
 const char NetworkActivationHandler::kErrorShillError[] = "shill-error";
 
 NetworkActivationHandler::NetworkActivationHandler() {}
 NetworkActivationHandler::~NetworkActivationHandler() {}
 
 void NetworkActivationHandler::Activate(
     const std::string& service_path,
     const std::string& carrier,
     const base::Closure& success_callback,
     const network_handler::ErrorCallback& error_callback) {
   NET_LOG_USER("ActivateNetwork", service_path);
   CallShillActivate(service_path, carrier, success_callback, error_callback);
 }
 
 void NetworkActivationHandler::CompleteActivation(
     const std::string& service_path,
     const base::Closure& success_callback,
     const network_handler::ErrorCallback& error_callback) {
   NET_LOG_USER("CompleteActivation", service_path);
   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 NetworkState properties, I would
rather just make this a member of NetworkState.

[armansito, 2013/09/16 21:19:20]

Done.

+}
+
 void NetworkActivationHandler::CallShillActivate(
     const std::string& service_path,
     const std::string& carrier,
     const base::Closure& success_callback,
     const network_handler::ErrorCallback& error_callback) {
   NET_LOG_USER("Activation Request", service_path + ": '" + carrier + "'");
   DBusThreadManager::Get()->GetShillServiceClient()->ActivateCellularModem(
       dbus::ObjectPath(service_path),
       carrier,
       base::Bind(&NetworkActivationHandler::HandleShillSuccess,
@@ skipping 16 matching lines @@
 }
 
 void NetworkActivationHandler::HandleShillSuccess(
     const std::string& service_path,
     const base::Closure& success_callback) {
   if (!success_callback.is_null())
     success_callback.Run();
 }
 
 }  // namespace chromeos