Convert TrayVPN to use new NetworkState code

ash/system/chromeos/network/network_icon.h

 // 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.
 
 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_
 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_
 
 #include <string>
 
 #include "base/string16.h"
@@ skipping 26 matching lines @@
                                             const std::string& network_type);
 
 // Gets the image for a disconnected network type.
 gfx::ImageSkia GetImageForDisconnectedNetwork(IconType icon_type,
                                               const std::string& network_type);
 
 // Returns the label for |network| based on |icon_type|. |network| can be NULL.
 string16 GetLabelForNetwork(const chromeos::NetworkState* network,
                             IconType icon_type);
 
+// Updates and returns the appropriate message id if the cellular network
+// is uninitialized.
+int GetCellularUninitializedMsg();

[stevenjb, 2013/03/02 03:14:45]

Since network_icon handles most other network related messages (it could really
be named network_icon_and_text, but that's kind of a mouthful), this seemed like
as good a place as any for this. It's used by both NetworkStateListDetailedView,
which is not persistent, and by TrayNetwork, but NetworkStateListDetailedView no
longer knows details about TrayNetwork and might be spawned by TrayVpn.

+
 }  // namespace network_icon
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_