Rewritten parts of NetworkLibrary to work around memory corruption that prev...

chrome/browser/chromeos/status/network_menu_button.cc

 // 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.
 
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "app/l10n_util.h"
@@ skipping 67 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (CrosLibrary::Get()->EnsureLoaded()) {
     if (cros->wifi_connecting() || cros->cellular_connecting()) {
       // Start the connecting animation if not running.
       if (!animation_connecting_.is_animating()) {
         animation_connecting_.Reset();
         animation_connecting_.StartThrobbing(std::numeric_limits<int>::max());
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
       }
       std::string network_name = cros->wifi_connecting() ?
-          cros->wifi_network().name() : cros->cellular_network().name();
+          cros->wifi_network()->name() : cros->cellular_network()->name();
       bool configuring = cros->wifi_connecting() ?
-          cros->wifi_network().configuring() :
-          cros->cellular_network().configuring();
+          cros->wifi_network()->configuring() :
+          cros->cellular_network()->configuring();
       SetTooltipText(
           l10n_util::GetStringF(configuring ?
               IDS_STATUSBAR_NETWORK_CONFIGURING_TOOLTIP :
               IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP,
               UTF8ToWide(network_name)));
     } else {
       // Stop connecting animation since we are not connecting.
       animation_connecting_.Stop();
 
       // Always show the higher priority connection first. Ethernet then wifi.
       if (cros->ethernet_connected()) {
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
         SetTooltipText(
             l10n_util::GetStringF(
                 IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
                 l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)));
       } else if (cros->wifi_connected()) {
         SetIcon(IconForNetworkStrength(
-            cros->wifi_network().strength(), false));
+            cros->wifi_network()->strength(), false));
         SetTooltipText(l10n_util::GetStringF(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(cros->wifi_network().name())));
+            UTF8ToWide(cros->wifi_network()->name())));
       } else if (cros->cellular_connected()) {
-        const CellularNetwork& cellular = cros->cellular_network();
-        if (cellular.data_left() == CellularNetwork::DATA_NONE) {
+        const CellularNetwork* cellular = cros->cellular_network();
+        if (cellular->data_left() == CellularNetwork::DATA_NONE) {
           // If no data, then we show 0 bars.
           SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
         } else {
           SetIcon(IconForNetworkStrength(cellular));
         }
         SetTooltipText(l10n_util::GetStringF(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(cellular.name())));
+            UTF8ToWide(cellular->name())));
       } else {
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
         SetTooltipText(l10n_util::GetString(
             IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
       }
     }
 
     // Figure out whether or not to show a badge.
     int id = -1;
     if (cros->Connecting()) {
       if (cros->cellular_connecting()) {
         id = IDR_STATUSBAR_NETWORK_3G;
       }
     } else if (cros->Connected()) {
       if (!cros->ethernet_connected() && !cros->wifi_connected() &&
           cros->cellular_connected()) {
-        switch (cros->cellular_network().data_left()) {
+        switch (cros->cellular_network()->data_left()) {
           case CellularNetwork::DATA_NONE:
           case CellularNetwork::DATA_VERY_LOW:
             id = IDR_STATUSBAR_NETWORK_3G_ERROR;
             break;
           case CellularNetwork::DATA_LOW:
             id = IDR_STATUSBAR_NETWORK_3G_WARN;
             break;
           case CellularNetwork::DATA_NORMAL:
             id = IDR_STATUSBAR_NETWORK_3G;
             break;
@@ skipping 36 matching lines @@
 
 void NetworkMenuButton::OpenButtonOptions() const {
   host_->OpenButtonOptions(this);
 }
 
 bool NetworkMenuButton::ShouldOpenButtonOptions() const {
   return host_->ShouldOpenButtonOptions(this);
 }
 
 }  // namespace chromeos