[cros] Hide chrome://mobilesetup content on non-supported networks.

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

 // Copyright (c) 2011 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 384 matching lines @@
     const std::string& service_path)
     : DataSource(chrome::kChromeUIMobileSetupHost, MessageLoop::current()),
       service_path_(service_path) {
 }
 
 void MobileSetupUIHTMLSource::StartDataRequest(const std::string& path,
                                                bool is_incognito,
                                                int request_id) {
   chromeos::CellularNetwork* network = GetCellularNetwork(service_path_);
   DCHECK(network);
+  if (!network->SupportsActivation()) {
+    scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
+    SendResponse(request_id, html_bytes);
+    return;
+  }
   DictionaryValue strings;
   strings.SetString("title", l10n_util::GetStringUTF16(IDS_MOBILE_SETUP_TITLE));
   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",
@@ skipping 49 matching lines @@
     lib->Unlock();
   ReEnableOtherConnections();
 }
 
 WebUIMessageHandler* MobileSetupHandler::Attach(WebUI* web_ui) {
   return WebUIMessageHandler::Attach(web_ui);
 }
 
 void MobileSetupHandler::Init(TabContents* contents) {
   tab_contents_ = contents;
   LoadCellularConfig();

[zel, 2011/07/07 16:30:56]

you can probably do all this before you load the config

[Nikita (slow), 2011/07/07 16:49:14]

Done. At some point I've thought to use some error messages from it.

+  chromeos::CellularNetwork* network = GetCellularNetwork(service_path_);
+  if (!network || !network->SupportsActivation())
+    return;
   if (!chromeos::CrosLibrary::Get()->GetNetworkLibrary()->IsLocked())
-    SetupActivationProcess(GetCellularNetwork(service_path_));
+    SetupActivationProcess(network);
   else
     already_running_ = true;
 }
 
 void MobileSetupHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(kJsApiStartActivation,
       NewCallback(this, &MobileSetupHandler::HandleStartActivation));
   web_ui_->RegisterMessageCallback(kJsApiSetTransactionStatus,
       NewCallback(this, &MobileSetupHandler::HandleSetTransactionStatus));
 }
@@ skipping 833 matching lines @@
   std::string service_path = network ? network->service_path() : std::string();
   MobileSetupHandler* handler = new MobileSetupHandler(service_path);
   AddMessageHandler((handler)->Attach(this));
   handler->Init(contents);
   MobileSetupUIHTMLSource* html_source =
       new MobileSetupUIHTMLSource(service_path);
 
   // Set up the chrome://mobilesetup/ source.
   contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }