Update activation flow for lte devices not to show 3G loading page.

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>
 
@@ skipping 222 matching lines @@
 
   if (!network || (!network->SupportsActivation() && !network->activated())) {
     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);
     return;
   }
 
   LOG(WARNING) << "Starting mobile setup for " << path;
   DictionaryValue 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.
-  if (network->activated()) {
-    strings.SetString("portal_unreachable_header",
-        l10n_util::GetStringUTF16(IDS_MOBILE_NO_CONNECTION_HEADER));
-  } else {
-    strings.SetString("connecting_header",
-                      l10n_util::GetStringFUTF16(IDS_MOBILE_CONNECTING_HEADER,
-                          network ? UTF8ToUTF16(network->name()) : string16()));
-    strings.SetString("error_header",
-                      l10n_util::GetStringUTF16(IDS_MOBILE_ERROR_HEADER));
-    strings.SetString("activating_header",
-                      l10n_util::GetStringUTF16(IDS_MOBILE_ACTIVATING_HEADER));
-    strings.SetString("completed_header",
-                      l10n_util::GetStringUTF16(IDS_MOBILE_COMPLETED_HEADER));
-    strings.SetString("please_wait",
-                      l10n_util::GetStringUTF16(IDS_MOBILE_PLEASE_WAIT));
-    strings.SetString("completed_text",
-                      l10n_util::GetStringUTF16(IDS_MOBILE_COMPLETED_TEXT));
-  }
 
-  // Strings shared between both webui versions.
+  strings.SetString("connecting_header",
+                    l10n_util::GetStringFUTF16(IDS_MOBILE_CONNECTING_HEADER,
+                        network ? UTF8ToUTF16(network->name()) : string16()));
+  strings.SetString("error_header",
+                    l10n_util::GetStringUTF16(IDS_MOBILE_ERROR_HEADER));
+  strings.SetString("activating_header",
+                    l10n_util::GetStringUTF16(IDS_MOBILE_ACTIVATING_HEADER));
+  strings.SetString("completed_header",
+                    l10n_util::GetStringUTF16(IDS_MOBILE_COMPLETED_HEADER));
+  strings.SetString("please_wait",
+                    l10n_util::GetStringUTF16(IDS_MOBILE_PLEASE_WAIT));
+  strings.SetString("completed_text",
+                    l10n_util::GetStringUTF16(IDS_MOBILE_COMPLETED_TEXT));
+  strings.SetString("portal_unreachable_header",
+                    l10n_util::GetStringUTF16(IDS_MOBILE_NO_CONNECTION_HEADER));
   strings.SetString("title", l10n_util::GetStringUTF16(IDS_MOBILE_SETUP_TITLE));
   strings.SetString("close_button",
                     l10n_util::GetStringUTF16(IDS_CLOSE));
   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.
   int html_page = network->activated() ? IDR_MOBILE_SETUP_PORTAL_PAGE_HTML :
                                          IDR_MOBILE_SETUP_PAGE_HTML;
   static const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(html_page));
 
   std::string full_html = webui::GetI18nTemplateHtml(html, &strings);
 
   callback.Run(base::RefCountedString::TakeString(&full_html));
 }
 
@@ skipping 113 matching lines @@
   CellularNetwork* network =
       network_lib->FindCellularNetworkByPath(path.substr(1));
   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 &&
-      (network->network_technology() == chromeos::NETWORK_TECHNOLOGY_LTE ||
-       network->network_technology() ==
-           chromeos::NETWORK_TECHNOLOGY_LTE_ADVANCED)) {
-    type_ = TYPE_PORTAL_LTE;
-    network_lib->AddNetworkManagerObserver(this);
-    // 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*/);
-  } else {
-    type_ = TYPE_PORTAL;
+  if (type_ == TYPE_UNDETERMINED) {
+    if (network->network_technology() == chromeos::NETWORK_TECHNOLOGY_LTE ||
+        network->network_technology() ==
+            chromeos::NETWORK_TECHNOLOGY_LTE_ADVANCED) {
+      type_ = TYPE_PORTAL_LTE;
+      network_lib->AddNetworkManagerObserver(this);
+      // 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*/);
+    } 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) {
   if (!web_ui())
     return;
@@ skipping 32 matching lines @@
   lte_portal_reachable_ = portal_reachable;
 }
 
 void MobileSetupHandler::GetDeviceInfo(CellularNetwork* network,
                                        DictionaryValue* value) {
   DCHECK(network);
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   if (!cros)
     return;
+  value->SetBoolean("activate_over_non_cellular_network",
+                    network->activate_over_non_cellular_network());
   value->SetString("carrier", network->name());
   value->SetString("payment_url", network->payment_url());
   if (network->using_post() && network->post_data().length())
     value->SetString("post_data", network->post_data());
 
   const chromeos::NetworkDevice* device =
       cros->FindNetworkDeviceByPath(network->device_path());
   if (device) {
     value->SetString("MEID", device->meid());
     value->SetString("IMEI", device->imei());
@@ skipping 14 matching lines @@
 
   // 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);
 }