Switch over MobileActivator to use Network*Handler

chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/network_library.h"

[stevenjb, 2013/08/14 02:28:31]

Remove

[gauravsh, 2013/08/14 21:42:29]

Done.

 #include "chrome/browser/chromeos/mobile/mobile_activator.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "chromeos/network/device_state.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/network_state_handler_observer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host_observer.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/jstemplate_builder.h"
 #include "ui/webui/web_ui_util.h"
 #include "url/gurl.h"
 
-using chromeos::CellularNetwork;
 using chromeos::MobileActivator;
-using chromeos::NetworkLibrary;
+using chromeos::NetworkHandler;
+using chromeos::NetworkState;
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace {
 
 // Host page JS API function names.
 const char kJsApiStartActivation[] = "startActivation";
 const char kJsApiSetTransactionStatus[] = "setTransactionStatus";
@@ skipping 80 matching lines @@
  private:
   virtual ~MobileSetupUIHTMLSource() {}
 
   DISALLOW_COPY_AND_ASSIGN(MobileSetupUIHTMLSource);
 };
 
 // The handler for Javascript messages related to the "register" view.
 class MobileSetupHandler
   : public WebUIMessageHandler,
     public MobileActivator::Observer,
-    public NetworkLibrary::NetworkManagerObserver,
+    public chromeos::NetworkStateHandlerObserver,
     public base::SupportsWeakPtr<MobileSetupHandler> {
  public:
   MobileSetupHandler();
   virtual ~MobileSetupHandler();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
  private:
   enum Type {
     TYPE_UNDETERMINED,
     // The network is not yet activated, and the webui is in activation flow.
     TYPE_ACTIVATION,
     // The network is activated, the webui displays network portal.
     TYPE_PORTAL,
     // Same as TYPE_PORTAL, but the network technology is LTE. The webui is
     // additionally aware of network manager state and whether the portal can be
     // reached.
     TYPE_PORTAL_LTE
   };
 
-  // Changes internal state.
+  // MobileActivator::Observer.
   virtual void OnActivationStateChanged(
-      CellularNetwork* network,
+      const NetworkState* network,
       MobileActivator::PlanActivationState new_state,
       const std::string& error_description) OVERRIDE;
 
   // Handlers for JS WebUI messages.
   void HandleSetTransactionStatus(const ListValue* args);
   void HandleStartActivation(const ListValue* args);
   void HandlePaymentPortalLoad(const ListValue* args);
   void HandleGetDeviceInfo(const ListValue* args);
 
-  // NetworkLibrary::NetworkManagerObserver implementation.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* network_lib) OVERRIDE;
+  // NetworkStateHandlerObserver implementation.
+  virtual void NetworkManagerChanged() OVERRIDE;
+  virtual void DefaultNetworkChanged(
+      const NetworkState* default_network) OVERRIDE;
 
   // Updates |lte_portal_reachable_| for lte network |network| and notifies
   // webui of the new state if the reachability changed or |force_notification|
   // is set.
-  void UpdatePortalReachability(NetworkLibrary* network_lib,
-                                CellularNetwork* network,
+  void UpdatePortalReachability(const NetworkState* network,
                                 bool force_notification);
 
   // Sends message to host registration page with system/user info data.
   void SendDeviceInfo();
 
   // Converts the currently active CellularNetwork device into a JS object.
-  static void GetDeviceInfo(CellularNetwork* network,
+  static void GetDeviceInfo(const NetworkState* network,
                             DictionaryValue* value);
 
   // Type of the mobilesetup webui deduced from received messages.
   Type type_;
   // Whether portal page for lte networks can be reached in current network
   // connection state. This value is reflected in portal webui for lte networks.
   // Initial value is true.
   bool lte_portal_reachable_;
 
   DISALLOW_COPY_AND_ASSIGN(MobileSetupHandler);
@@ skipping 10 matching lines @@
 
 std::string MobileSetupUIHTMLSource::GetSource() const {
   return chrome::kChromeUIMobileSetupHost;
 }
 
 void MobileSetupUIHTMLSource::StartDataRequest(
     const std::string& path,
     int render_process_id,
     int render_view_id,
     const content::URLDataSource::GotDataCallback& callback) {
-  CellularNetwork* network = NULL;
+  const NetworkState* network = NULL;
   if (!path.empty()) {
-    network = NetworkLibrary::Get()-> FindCellularNetworkByPath(path);
+    network = NetworkHandler::Get()->network_state_handler()->GetNetworkState(
+        path);
   }
 
-  if (!network || (!network->SupportsActivation() && !network->activated())) {
+  if (!network ||
+      (network->payment_url().empty() && network->usage_url().empty() &&
+       network->activation_state() != flimflam::kActivationStateActivated)) {
     LOG(WARNING) << "Can't find device to activate for service path " << path;
     scoped_refptr<base::RefCountedBytes> html_bytes(new base::RefCountedBytes);
     callback.Run(html_bytes.get());
     return;
   }
 
   LOG(WARNING) << "Starting mobile setup for " << path;
   DictionaryValue strings;
 
   strings.SetString("connecting_header",
@@ skipping 19 matching lines @@
   strings.SetString("cancel_button",
                     l10n_util::GetStringUTF16(IDS_CANCEL));
   strings.SetString("ok_button",
                     l10n_util::GetStringUTF16(IDS_OK));
   webui::SetFontAndTextDirection(&strings);
 
   // The webui differs based on whether the network is activated or not. If the
   // network is activated, the webui goes straight to portal. Otherwise the
   // webui is used for activation flow.
   std::string full_html;
-  if (network->activated()) {
+  if (network->activation_state() == flimflam::kActivationStateActivated) {
     static const base::StringPiece html_for_activated(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             IDR_MOBILE_SETUP_PORTAL_PAGE_HTML));
     full_html = webui::GetI18nTemplateHtml(html_for_activated, &strings);
   } else {
     static const base::StringPiece html_for_non_activated(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             IDR_MOBILE_SETUP_PAGE_HTML));
     full_html = webui::GetI18nTemplateHtml(html_for_non_activated, &strings);
   }
 
   callback.Run(base::RefCountedString::TakeString(&full_html));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MobileSetupHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 MobileSetupHandler::MobileSetupHandler()
     : type_(TYPE_UNDETERMINED),
       lte_portal_reachable_(true) {
 }
 
 MobileSetupHandler::~MobileSetupHandler() {
   if (type_ == TYPE_ACTIVATION) {
     MobileActivator::GetInstance()->RemoveObserver(this);
     MobileActivator::GetInstance()->TerminateActivation();
   } else if (type_ == TYPE_PORTAL_LTE) {
-    NetworkLibrary::Get()->RemoveNetworkManagerObserver(this);
+    NetworkHandler::Get()->network_state_handler()->RemoveObserver(this,
+                                                                   FROM_HERE);
   }
 }
 
 void MobileSetupHandler::OnActivationStateChanged(
-    CellularNetwork* network,
+    const NetworkState* network,
     MobileActivator::PlanActivationState state,
     const std::string& error_description) {
   DCHECK_EQ(TYPE_ACTIVATION, type_);
   if (!web_ui())
     return;
 
   DictionaryValue device_dict;
   if (network)
     GetDeviceInfo(network, &device_dict);
   device_dict.SetInteger("state", state);
@@ skipping 71 matching lines @@
 
 void MobileSetupHandler::HandleGetDeviceInfo(const ListValue* args) {
   DCHECK_NE(TYPE_ACTIVATION, type_);
   if (!web_ui())
     return;
 
   std::string path = web_ui()->GetWebContents()->GetURL().path();
   if (path.empty())
     return;
 
-  NetworkLibrary* network_lib = NetworkLibrary::Get();
-  CellularNetwork* network =
-      network_lib->FindCellularNetworkByPath(path.substr(1));
+  chromeos::NetworkStateHandler* nsh =
+      NetworkHandler::Get()->network_state_handler();
+  const NetworkState* network = nsh->GetNetworkState(path.substr(1));

[stevenjb, 2013/08/14 02:28:31]

the path.substr(1) should probably be assigned to a local and documented.

[gauravsh, 2013/08/14 21:42:29]

The path is of the form //service/5, so the path.substr() gets rid of the extra
'/'.

I don't really understand how the URL of the WebContents frame gets set to this.
Do any of you know?

[stevenjb, 2013/08/14 21:58:35]

I do not. We should at least add some sort of comment, even if it's a 'TODO:
investigate why there is an extra '/' at the beginning of path'

[armansito, 2013/08/14 22:46:34]

The URL should be obtained from the service in question (via Service.Olp). This
code launches an extension that lives in chromeos-assets in the ChromeOS source.

[gauravsh, 2013/08/15 01:46:35]

Done.

   if (!network) {
     web_ui()->GetWebContents()->Close();
     return;
   }
 
   // If this is the initial call, update the network status and start observing
   // network changes, but only for LTE networks. The other networks should
   // ignore network status.
   if (type_ == TYPE_UNDETERMINED) {
-    if (network->network_technology() == chromeos::NETWORK_TECHNOLOGY_LTE ||
+    if (network->network_technology() == flimflam::kNetworkTechnologyLte ||
         network->network_technology() ==
-            chromeos::NETWORK_TECHNOLOGY_LTE_ADVANCED) {
+            flimflam::kNetworkTechnologyLteAdvanced) {
       type_ = TYPE_PORTAL_LTE;
-      network_lib->AddNetworkManagerObserver(this);
+      nsh->AddObserver(this, FROM_HERE);
       // Update the network status and notify the webui. This is the initial
       // network state so the webui should be notified no matter what.
-      UpdatePortalReachability(network_lib,
-                               network,
-                               true /*force notification*/);
+      UpdatePortalReachability(network, true /*force notification*/);
     } else {
       type_ = TYPE_PORTAL;
       // For non-LTE networks network state is ignored, so report the portal is
       // reachable, so it gets shown.
       web_ui()->CallJavascriptFunction(kJsConnectivityChangedCallback,
                                        base::FundamentalValue(true));
     }
   }
 
   DictionaryValue device_info;
   GetDeviceInfo(network, &device_info);
   web_ui()->CallJavascriptFunction(kJsGetDeviceInfoCallback, device_info);
 }
 
-void MobileSetupHandler::OnNetworkManagerChanged(NetworkLibrary* network_lib) {
+void MobileSetupHandler::NetworkManagerChanged() {
   if (!web_ui())
     return;
 
   std::string path = web_ui()->GetWebContents()->GetURL().path();
   if (path.empty())
     return;
 
-  CellularNetwork* network =
-      network_lib->FindCellularNetworkByPath(path.substr(1));
+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->GetNetworkState(
+          path.substr(1));
   if (!network) {
     LOG(ERROR) << "Service path lost";
     web_ui()->GetWebContents()->Close();
     return;
   }
 
-  UpdatePortalReachability(network_lib, network, false /*force notification*/);
+  UpdatePortalReachability(network, false /*force notification*/);

[armansito, 2013/08/14 00:49:51]

The inline comment here makes me think that "false" means "notification should
be forced" while the method signature implies otherwise. Can you change (or
remove) the inline comment?

[gauravsh, 2013/08/14 21:42:29]

Done.

 }
 
-void MobileSetupHandler::UpdatePortalReachability(NetworkLibrary* network_lib,
-                                                  CellularNetwork* network,
-                                                  bool force_notification) {
+void MobileSetupHandler::DefaultNetworkChanged(
+    const NetworkState* default_network) {
+  NetworkManagerChanged();
+}
+
+void MobileSetupHandler::UpdatePortalReachability(
+    const NetworkState* network,
+    bool force_notification) {
   DCHECK(web_ui());
 
   DCHECK_EQ(type_, TYPE_PORTAL_LTE);
 
-  bool portal_reachable = network->connected() ||
-                          (network_lib->connected_network() &&
-                           network_lib->connected_network()->online());
+  chromeos::NetworkStateHandler* nsh =
+      NetworkHandler::Get()->network_state_handler();
+  bool portal_reachable =
+      (network->IsConnectedState() ||
+       (nsh->DefaultNetwork() &&
+        nsh->DefaultNetwork()->connection_state() == flimflam::kStateOnline));
 
   if (force_notification || portal_reachable != lte_portal_reachable_) {
     web_ui()->CallJavascriptFunction(kJsConnectivityChangedCallback,
                                      base::FundamentalValue(portal_reachable));
   }
 
   lte_portal_reachable_ = portal_reachable;
 }
 
-void MobileSetupHandler::GetDeviceInfo(CellularNetwork* network,
+void MobileSetupHandler::GetDeviceInfo(const NetworkState* network,
                                        DictionaryValue* value) {
   DCHECK(network);
   chromeos::NetworkLibrary* cros =
       chromeos::NetworkLibrary::Get();
   if (!cros)
     return;

[stevenjb, 2013/08/14 02:28:31]

Remove

[gauravsh, 2013/08/14 21:42:29]

Done.

   value->SetBoolean("activate_over_non_cellular_network",
-                    network->activate_over_non_cellular_network());
+                    network->activate_over_non_cellular_networks());
   value->SetString("carrier", network->name());
   value->SetString("payment_url", network->payment_url());
-  if (network->using_post() && network->post_data().length())
+  if (network->post_method() == "post" && !network->post_data().empty())
     value->SetString("post_data", network->post_data());
 
-  const chromeos::NetworkDevice* device =
-      cros->FindNetworkDeviceByPath(network->device_path());
+  const chromeos::DeviceState* device =
+      NetworkHandler::Get()->network_state_handler()->GetDeviceState(
+          network->device_path());
   if (device) {
     value->SetString("MEID", device->meid());
     value->SetString("IMEI", device->imei());
     value->SetString("MDN", device->mdn());
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MobileSetupUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 MobileSetupUI::MobileSetupUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new MobileSetupHandler());
   MobileSetupUIHTMLSource* html_source = new MobileSetupUIHTMLSource();
 
   // Set up the chrome://mobilesetup/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::URLDataSource::Add(profile, html_source);
 }
 
 void MobileSetupUI::RenderViewCreated(RenderViewHost* host) {
   // Destroyed by the corresponding RenderViewHost
   new PortalFrameLoadObserver(AsWeakPtr(), host);
 }