Hooked mobile activation UI with the new libcros additions

chrome/browser/chromeos/cros/network_library.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "base/platform_thread.h"
 #include "base/singleton.h"
 #include "base/timer.h"
 #include "cros/chromeos_network.h"
 
 namespace chromeos {
 
 class Network {
  public:
   const std::string& service_path() const { return service_path_; }
   const std::string& device_path() const { return device_path_; }
   const std::string& ip_address() const { return ip_address_; }
   ConnectionType type() const { return type_; }
+  ConnectionState connection_state() const { return state_; }
   bool connecting() const { return state_ == STATE_ASSOCIATION ||
       state_ == STATE_CONFIGURATION || state_ == STATE_CARRIER; }
   bool connected() const { return state_ == STATE_READY; }
   bool connecting_or_connected() const { return connecting() || connected(); }
   bool failed() const { return state_ == STATE_FAILURE; }
   ConnectionError error() const { return error_; }
 
   void set_service_path(const std::string& service_path) {
       service_path_ = service_path; }
   void set_connecting(bool connecting) { state_ = (connecting ?
@@ skipping 19 matching lines @@
   Network()
       : type_(TYPE_UNKNOWN),
         state_(STATE_UNKNOWN),
         error_(ERROR_UNKNOWN) {}
   virtual ~Network() {}
 
   std::string service_path_;
   std::string device_path_;
   std::string ip_address_;
   ConnectionType type_;
-  int state_;
+  ConnectionState state_;
   ConnectionError error_;
 };
 
 class EthernetNetwork : public Network {
  public:
   EthernetNetwork() : Network() {}
 };
 
 class WirelessNetwork : public Network {
  public:
@@ skipping 46 matching lines @@
     ConfigureFromService(service);
   }
 
   // Starts device activation process. Returns false if the device state does
   // not permit activation.
   bool StartActivation() const;
   const ActivationState activation_state() const { return activation_state_; }
   const NetworkTechnology network_technology() const {
     return network_technology_; }
   const NetworkRoamingState roaming_state() const { return roaming_state_; }
-  const std::string& operator_name() const { return payment_url_; }
-  const std::string& operator_code() const { return payment_url_; }
+  const std::string& operator_name() const { return operator_name_; }
+  const std::string& operator_code() const { return operator_code_; }
   const std::string& payment_url() const { return payment_url_; }
   const std::string& meid() const { return meid_; }
   const std::string& imei() const { return imei_; }
   const std::string& imsi() const { return imsi_; }
   const std::string& esn() const { return esn_; }
   const std::string& mdn() const { return mdn_; }
   const std::string& min() const { return min_; }
   const std::string& model_id() const { return model_id_; }
   const std::string& manufacturer() const { return manufacturer_; }
   const std::string& firmware_revision() const { return firmware_revision_; }
@@ skipping 264 matching lines @@
   virtual std::string GetHtmlInfo(int refresh) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_