Move tray code from ui/chromeos/network/

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

Index: ash/common/system/chromeos/network/network_state_list_detailed_view.h
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.h b/ash/common/system/chromeos/network/network_state_list_detailed_view.h
index 70172eddb788c4e5a614965efb5ef99baa0a9c4d..ced6f9a3754c36f076ca51501b47dfb9c3d9fc2f 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.h
@@ -10,9 +10,9 @@
 
 #include "ash/common/login_status.h"
 #include "ash/common/system/chromeos/network/network_detailed_view.h"
+#include "ash/common/system/chromeos/network/network_list_delegate.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "ui/chromeos/network/network_list_delegate.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/button.h"
 
@@ -20,7 +20,7 @@ namespace chromeos {
 class NetworkTypePattern;
 }
 
-namespace ui {
+namespace ash {
 class NetworkListViewBase;
 }
 
@@ -39,7 +39,7 @@ namespace tray {
 
 class NetworkStateListDetailedView
     : public NetworkDetailedView,
-      public ui::NetworkListDelegate,
+      public NetworkListDelegate,
       public base::SupportsWeakPtr<NetworkStateListDetailedView> {
  public:
   enum ListType { LIST_TYPE_NETWORK, LIST_TYPE_VPN };
@@ -98,7 +98,7 @@ class NetworkStateListDetailedView
   // Creates the view of an extra icon appearing next to the network name
   // indicating that the network is controlled by an extension. If no extension
   // is registered for this network, returns |nullptr|.
-  views::View* CreateControlledByExtensionView(const ui::NetworkInfo& info);
+  views::View* CreateControlledByExtensionView(const NetworkInfo& info);
 
   // Periodically request a network scan.
   void CallRequestScan();
@@ -106,12 +106,12 @@ class NetworkStateListDetailedView
   // Handle toggile mobile action
   void ToggleMobile();
 
-  // ui::NetworkListDelegate:
-  views::View* CreateViewForNetwork(const ui::NetworkInfo& info) override;
+  // NetworkListDelegate:
+  views::View* CreateViewForNetwork(const NetworkInfo& info) override;
   bool IsViewHovered(views::View* view) override;
   chromeos::NetworkTypePattern GetNetworkTypePattern() const override;
   void UpdateViewForNetwork(views::View* view,
-                            const ui::NetworkInfo& info) override;
+                            const NetworkInfo& info) override;
   views::Label* CreateInfoLabel() override;
   void OnNetworkEntryClicked(views::View* sender) override;
   void OnOtherWifiClicked() override;
@@ -150,7 +150,7 @@ class NetworkStateListDetailedView
 
   gfx::Image controlled_by_extension_icon_;
 
-  std::unique_ptr<ui::NetworkListViewBase> network_list_view_;
+  std::unique_ptr<NetworkListViewBase> network_list_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView);
 };