Move tray code from ui/chromeos/network/

ash/common/system/chromeos/network/network_icon.h

Index: ash/common/system/chromeos/network/network_icon.h
diff --git a/ui/chromeos/network/network_icon.h b/ash/common/system/chromeos/network/network_icon.h
similarity index 65%
rename from ui/chromeos/network/network_icon.h
rename to ash/common/system/chromeos/network/network_icon.h
index 347adb74770cf3c4b1b04c15253712f75ea7ad22..d42f02e7e15ddf9ff63dc350f5ce64ea86d0efcd 100644
--- a/ui/chromeos/network/network_icon.h
+++ b/ash/common/system/chromeos/network/network_icon.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_CHROMEOS_NETWORK_NETWORK_ICON_H_
-#define UI_CHROMEOS_NETWORK_NETWORK_ICON_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_
 
 #include <string>
 
+#include "ash/ash_export.h"
 #include "base/strings/string16.h"
-#include "ui/chromeos/ui_chromeos_export.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 class NetworkState;
 }
 
-namespace ui {
+namespace ash {
 namespace network_icon {
 
 class AnimationObserver;
@@ -30,49 +30,48 @@ enum IconType {
 // Gets the image for the network associated with |service_path|. |network| must
 // not be NULL. |icon_type| determines the color theme and whether or not to
 // show the VPN badge. This caches badged icons per network per |icon_type|.
-UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForNetwork(
+ASH_EXPORT gfx::ImageSkia GetImageForNetwork(
     const chromeos::NetworkState* network,
     IconType icon_type);
 
 // Gets the full strength image for a Wi-Fi network.
 // TODO(estade): Expose SignalStrengthImageSource and use that instead.
-UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForConnectedMobileNetwork();
+ASH_EXPORT gfx::ImageSkia GetImageForConnectedMobileNetwork();
 
 // Gets the disconnected image for a cell network.
 // TODO(estade): Expose SignalStrengthImageSource and use that instead.
-UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForDisconnectedCellNetwork();
+ASH_EXPORT gfx::ImageSkia GetImageForDisconnectedCellNetwork();
 
 // Gets the full strength image for a Wi-Fi network using |icon_color| for the
 // main icon and |badge_color| for the badge.
-UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForNewWifiNetwork(
-    SkColor icon_color,
-    SkColor badge_color);
+ASH_EXPORT gfx::ImageSkia GetImageForNewWifiNetwork(SkColor icon_color,
+                                                    SkColor badge_color);
 
 // Returns a vpn image suitable for use on a light background.
-UI_CHROMEOS_EXPORT gfx::ImageSkia GetVpnImage();
+ASH_EXPORT gfx::ImageSkia GetVpnImage();
 
 // Returns the label for |network| based on |icon_type|. |network| can be NULL.
-UI_CHROMEOS_EXPORT base::string16 GetLabelForNetwork(
+ASH_EXPORT base::string16 GetLabelForNetwork(
     const chromeos::NetworkState* network,
     IconType icon_type);
 
 // Updates and returns the appropriate message id if the cellular network
 // is uninitialized.
-UI_CHROMEOS_EXPORT int GetCellularUninitializedMsg();
+ASH_EXPORT int GetCellularUninitializedMsg();
 
 // Gets the correct icon and label for |icon_type|. Also sets |animating|
 // based on whether or not the icon is animating (i.e. connecting).
-UI_CHROMEOS_EXPORT void GetDefaultNetworkImageAndLabel(IconType icon_type,
-                                                       gfx::ImageSkia* image,
-                                                       base::string16* label,
-                                                       bool* animating);
+ASH_EXPORT void GetDefaultNetworkImageAndLabel(IconType icon_type,
+                                               gfx::ImageSkia* image,
+                                               base::string16* label,
+                                               bool* animating);
 
 // Called when the list of networks changes. Retreives the list of networks
 // from the global NetworkStateHandler instance and removes cached entries
 // that are no longer in the list.
-UI_CHROMEOS_EXPORT void PurgeNetworkIconCache();
+ASH_EXPORT void PurgeNetworkIconCache();
 
 }  // namespace network_icon
-}  // namespace ui
+}  // namespace ash
 
-#endif  // UI_CHROMEOS_NETWORK_NETWORK_ICON_H_
+#endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_