Revert 282837 because it broke non-chromeos builds.

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

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
 
 #include <string>
 
+#include "ash/system/chromeos/network/network_icon.h"
+#include "ash/system/chromeos/network/network_icon_animation.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chromeos/network/network_state_handler.h"
 #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"
 
 namespace {
 
 // Timeout between consecutive requests to network library for network
 // scan.
 const int kNetworkScanIntervalSecs = 60;
 
@@ skipping 92 matching lines @@
   handler->RequestScan();
   handler->AddObserver(this, FROM_HERE);
   Refresh();
   network_scan_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromSeconds(kNetworkScanIntervalSecs),
       this, &NetworkDropdown::RequestNetworkScan);
 }
 
 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);
   }
 }
 
 void NetworkDropdown::OnItemChosen(int id) {
   network_menu_->OnItemChosen(id);
 }
 
@@ skipping 33 matching lines @@
 
 void NetworkDropdown::Refresh() {
   SetNetworkIconAndText();
   network_menu_->UpdateMenu();
 }
 
 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();
   std::string icon_str;
   if (!icon_image.isNull())
     icon_str = webui::GetBitmapDataUrl(icon_bitmap);
   base::StringValue title(text);
   base::StringValue icon(icon_str);
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 void NetworkDropdown::RequestNetworkScan() {
   NetworkHandler::Get()->network_state_handler()->RequestScan();
   Refresh();
 }
 
 }  // namespace chromeos