chromeos: Move some network related UI in ui/chromeos/

ui/chromeos/network/network_icon.h

Index: ui/chromeos/network/network_icon.h
diff --git a/ash/system/chromeos/network/network_icon.h b/ui/chromeos/network/network_icon.h
similarity index 67%
rename from ash/system/chromeos/network/network_icon.h
rename to ui/chromeos/network/network_icon.h
index 7497930d643c81b7379ca50a812753905a9a6921..5227af3df0f5290a4984a2a1af1d15c1e2d209e9 100644
--- a/ash/system/chromeos/network/network_icon.h
+++ b/ui/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 ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_
-#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_
+#ifndef UI_CHROMEOS_NETWORK_NETWORK_ICON_H_
+#define UI_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 ash {
+namespace ui {
 namespace network_icon {
 
 class AnimationObserver;
@@ -30,54 +30,54 @@ 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|.
-ASH_EXPORT gfx::ImageSkia GetImageForNetwork(
+UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForNetwork(
     const chromeos::NetworkState* network,
     IconType icon_type);
 
 // Similar to GetImageForNetwork but returns the cached image url based on
 // |scale_factor| instead.
-ASH_EXPORT std::string GetImageUrlForNetwork(
+UI_CHROMEOS_EXPORT std::string GetImageUrlForNetwork(
     const chromeos::NetworkState* network,
     IconType icon_type,
     float scale_factor);
 
 // Gets the fulls strength image for a connected network type.
-ASH_EXPORT gfx::ImageSkia GetImageForConnectedNetwork(
+UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForConnectedNetwork(
     IconType icon_type,
     const std::string& network_type);
 
 // Gets the image for a connecting network type.
-ASH_EXPORT gfx::ImageSkia GetImageForConnectingNetwork(
+UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForConnectingNetwork(
     IconType icon_type,
     const std::string& network_type);
 
 // Gets the image for a disconnected network type.
-ASH_EXPORT gfx::ImageSkia GetImageForDisconnectedNetwork(
+UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForDisconnectedNetwork(
     IconType icon_type,
     const std::string& network_type);
 
 // Returns the label for |network| based on |icon_type|. |network| can be NULL.
-ASH_EXPORT base::string16 GetLabelForNetwork(
+UI_CHROMEOS_EXPORT base::string16 GetLabelForNetwork(
     const chromeos::NetworkState* network,
     IconType icon_type);
 
 // Updates and returns the appropriate message id if the cellular network
 // is uninitialized.
-ASH_EXPORT int GetCellularUninitializedMsg();
+UI_CHROMEOS_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).
-ASH_EXPORT void GetDefaultNetworkImageAndLabel(IconType icon_type,
-                                               gfx::ImageSkia* image,
-                                               base::string16* label,
-                                               bool* animating);
+UI_CHROMEOS_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.
-ASH_EXPORT void PurgeNetworkIconCache();
+UI_CHROMEOS_EXPORT void PurgeNetworkIconCache();
 
 }  // namespace network_icon
-}  // namespace ash
+}  // namespace ui
 
-#endif  // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_
+#endif  // UI_CHROMEOS_NETWORK_NETWORK_ICON_H_