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

chrome/browser/chromeos/status/network_dropdown_button.cc

Index: chrome/browser/chromeos/status/network_dropdown_button.cc
===================================================================
--- chrome/browser/chromeos/status/network_dropdown_button.cc	(revision 64441)
+++ chrome/browser/chromeos/status/network_dropdown_button.cc	(working copy)
@@ -86,13 +86,13 @@
     } else if (cros->wifi_connected()) {
       animation_connecting_.Stop();
       SetIcon(IconForNetworkStrength(
-          cros->wifi_network().strength(), true));
-      SetText(ASCIIToWide(cros->wifi_network().name()));
+          cros->wifi_network()->strength(), true));
+      SetText(ASCIIToWide(cros->wifi_network()->name()));
     } else if (cros->cellular_connected()) {
       animation_connecting_.Stop();
       SetIcon(IconForNetworkStrength(
-          cros->cellular_network().strength(), false));
-      SetText(ASCIIToWide(cros->cellular_network().name()));
+          cros->cellular_network()->strength(), false));
+      SetText(ASCIIToWide(cros->cellular_network()->name()));
     } else if (cros->wifi_connecting() || cros->cellular_connecting()) {
       if (!animation_connecting_.is_animating()) {
         animation_connecting_.Reset();
@@ -101,9 +101,9 @@
       }
 
       if (cros->wifi_connecting())
-        SetText(ASCIIToWide(cros->wifi_network().name()));
+        SetText(ASCIIToWide(cros->wifi_network()->name()));
       else if (cros->cellular_connecting())
-        SetText(ASCIIToWide(cros->cellular_network().name()));
+        SetText(ASCIIToWide(cros->cellular_network()->name()));
     }
 
     if (!cros->Connected() && !cros->Connecting()) {
Property changes on: chrome/browser/chromeos/status/network_dropdown_button.cc
___________________________________________________________________
Added: svn:eol-style
   + LF