Move tray code from ui/chromeos/network/

chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index 7ca997bc0aeb14e3f8c1c768a074905ffc61152b..a4811d1c7a11ee1158551138481d7bde7f60b5e2 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -8,6 +8,8 @@
 #include <string>
 #include <utility>
 
+#include "ash/common/system/chromeos/network/network_icon.h"
+#include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
@@ -19,8 +21,6 @@
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/webui/web_ui_util.h"
-#include "ui/chromeos/network/network_icon.h"
-#include "ui/chromeos/network/network_icon_animation.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
@@ -138,7 +138,7 @@ NetworkDropdown::NetworkDropdown(Actor* actor,
 }
 
 NetworkDropdown::~NetworkDropdown() {
-  ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+  ash::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   if (NetworkHandler::IsInitialized()) {
     NetworkHandler::Get()->network_state_handler()->RemoveObserver(
         this, FROM_HERE);
@@ -191,12 +191,13 @@ void NetworkDropdown::SetNetworkIconAndText() {
   base::string16 text;
   gfx::ImageSkia icon_image;
   bool animating = false;
-  ui::network_icon::GetDefaultNetworkImageAndLabel(
-      ui::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating);
+  ash::network_icon::GetDefaultNetworkImageAndLabel(
+      ash::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating);
   if (animating) {
-    ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
+    ash::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
   } else {
-    ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+    ash::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(
+        this);
   }
   SkBitmap icon_bitmap = icon_image.GetRepresentation(
       web_ui_->GetDeviceScaleFactor()).sk_bitmap();