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

ash/system/chromeos/network/network_state_list_detailed_view.cc

Index: ash/system/chromeos/network/network_state_list_detailed_view.cc
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index 616dc27fc8d5f2632009269b416355c4c68682cc..b771e1924cd5b2274b46bb8df05ce164cda7672c 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -11,8 +11,6 @@
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/chromeos/network/network_connect.h"
-#include "ash/system/chromeos/network/network_icon.h"
-#include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/system/tray/fixed_sized_scroll_view.h"
 #include "ash/system/tray/hover_highlight_view.h"
@@ -33,10 +31,13 @@
 #include "chromeos/network/network_state_handler.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
+#include "grit/ui_chromeos_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/chromeos/network/network_icon.h"
+#include "ui/chromeos/network/network_icon_animation.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ -169,7 +170,7 @@ NetworkStateListDetailedView::NetworkStateListDetailedView(
 NetworkStateListDetailedView::~NetworkStateListDetailedView() {
   if (info_bubble_)
     info_bubble_->GetWidget()->CloseNow();
-  network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+  ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
 
 void NetworkStateListDetailedView::ManagerChanged() {
@@ -485,10 +486,10 @@ void NetworkStateListDetailedView::UpdateNetworkList() {
         handler->GetNetworkState(info->service_path);
     if (!network)
       continue;
-    info->image = network_icon::GetImageForNetwork(
-        network, network_icon::ICON_TYPE_LIST);
-    info->label = network_icon::GetLabelForNetwork(
-        network, network_icon::ICON_TYPE_LIST);
+    info->image = ui::network_icon::GetImageForNetwork(
+        network, ui::network_icon::ICON_TYPE_LIST);
+    info->label = ui::network_icon::GetLabelForNetwork(
+        network, ui::network_icon::ICON_TYPE_LIST);
     info->highlight =
         network->IsConnectedState() || network->IsConnectingState();
     info->disable =
@@ -497,9 +498,9 @@ void NetworkStateListDetailedView::UpdateNetworkList() {
       animating = true;
   }
   if (animating)
-    network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
+    ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
   else
-    network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+    ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 
   // Get the updated list entries
   network_map_.clear();
@@ -611,7 +612,7 @@ bool NetworkStateListDetailedView::UpdateNetworkListEntries(
 
   if (list_type_ == LIST_TYPE_NETWORK) {
     // Cellular initializing
-    int status_message_id = network_icon::GetCellularUninitializedMsg();
+    int status_message_id = ui::network_icon::GetCellularUninitializedMsg();
     if (!status_message_id &&
         handler->IsTechnologyEnabled(NetworkTypePattern::Mobile()) &&
         !handler->FirstNetworkByType(NetworkTypePattern::Mobile())) {