Merge 150607 - Fix logic for VPN badges and network menu order

chrome/browser/chromeos/status/network_menu_icon.h

Index: chrome/browser/chromeos/status/network_menu_icon.h
===================================================================
--- chrome/browser/chromeos/status/network_menu_icon.h	(revision 150619)
+++ chrome/browser/chromeos/status/network_menu_icon.h	(working copy)
@@ -86,6 +86,9 @@
   // Sets the resource color theme (e.g. light or dark icons).
   void SetResourceColorTheme(ResourceColorTheme color);
 
+  // Returns true if the icon should be visible in a system tray.
+  bool ShouldShowIconInTray();
+
   // Generates and returns the icon image. If |text| is not NULL, sets it to
   // the tooltip or display text to show, based on the value of mode_.
   const gfx::ImageSkia GetIconAndText(string16* text);
@@ -114,9 +117,6 @@
   static const gfx::ImageSkia GetImage(const Network* network,
                                        ResourceColorTheme color);
 
-  // Returns an image representing an unconnected VPN.
-  static const gfx::ImageSkia GetVpnImage();
-
   // Access a specific image of the specified color theme. If index is out of
   // range, an empty image will be returned.
   static const gfx::ImageSkia GetImage(ImageType type,