Fix logic for VPN badges and network menu order

chrome/browser/chromeos/status/network_menu_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 CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_
 
 // NetworkMenuIcon Manages an icon that reflects the current state of the
 // network (see chromeos::NetworkLibrary). It takes an optional Delegate
 // argument in the constructor that signals the delegate when the icon changes.
@@ skipping 68 matching lines @@
   virtual ~NetworkMenuIcon();
 
   // Setter for |last_network_type_|
   void set_last_network_type(ConnectionType last_network_type) {
     last_network_type_ = last_network_type;
   }
 
   // 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);
 
   // ui::AnimationDelegate implementation.
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   // Static functions for generating network icon images:
 
   // Composites the images to generate a network icon. Input parameters are
   // the icon and badges that are composited to generate |result|. Public
   // primarily for unit tests.
   static const gfx::ImageSkia GenerateImageFromComponents(
       const gfx::ImageSkia& icon,
       const gfx::ImageSkia* top_left_badge,
       const gfx::ImageSkia* top_right_badge,
       const gfx::ImageSkia* bottom_left_badge,
       const gfx::ImageSkia* bottom_right_badge);
 
   // Returns a modified version of |source| representing the connecting state
   // of a network. Public for unit tests.
   static const gfx::ImageSkia GenerateConnectingImage(
       const gfx::ImageSkia& source);
 
   // Returns an image associated with |network|, reflecting its current state.
   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,
                                        int index,
                                        ResourceColorTheme color);
 
   // Gets the disconnected image for given type.
   static const gfx::ImageSkia GetDisconnectedImage(ImageType type,
                                                    ResourceColorTheme color);
 
@@ skipping 42 matching lines @@
   const Network* connecting_network_;
   // The tooltip or display text associated with the menu icon.
   string16 text_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenuIcon);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_