Move tray code from ui/chromeos/network/

ash/common/system/chromeos/network/network_list.cc

 // Copyright 2014 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 "ui/chromeos/network/network_list.h"
+#include "ash/common/system/chromeos/network/network_list.h"
 
 #include <stddef.h>
 
+#include "ash/common/system/chromeos/network/network_icon.h"
+#include "ash/common/system/chromeos/network/network_icon_animation.h"
+#include "ash/common/system/chromeos/network/network_info.h"
+#include "ash/common/system/chromeos/network/network_list_delegate.h"
 #include "base/memory/ptr_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "components/device_event_log/device_event_log.h"
-#include "grit/ui_chromeos_strings.h"
+#include "grit/ash_strings.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/chromeos/network/network_info.h"
-#include "ui/chromeos/network/network_list_delegate.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/view.h"
 
 using chromeos::LoginState;
 using chromeos::NetworkHandler;
 using chromeos::NetworkStateHandler;
 using chromeos::ManagedNetworkConfigurationHandler;
 using chromeos::NetworkTypePattern;
 
-namespace ui {
+namespace ash {
 
 namespace {
 
 bool IsProhibitedByPolicy(const chromeos::NetworkState* network) {
   if (!NetworkTypePattern::WiFi().MatchesType(network->type()))
     return false;
   if (!LoginState::IsInitialized() || !LoginState::Get()->IsUserLoggedIn())
     return false;
   ManagedNetworkConfigurationHandler* managed_configuration_handler =
       NetworkHandler::Get()->managed_network_configuration_handler();
@@ skipping 47 matching lines @@
   return true;
 }
 
 void NetworkListView::UpdateNetworks(
     const NetworkStateHandler::NetworkStateList& networks) {
   SCOPED_NET_LOG_IF_SLOW();
   network_list_.clear();
   const NetworkTypePattern pattern = delegate_->GetNetworkTypePattern();
   for (NetworkStateHandler::NetworkStateList::const_iterator iter =
            networks.begin();
-       iter != networks.end();
-       ++iter) {
+       iter != networks.end(); ++iter) {
     const chromeos::NetworkState* network = *iter;
     if (!pattern.MatchesType(network->type()))
       continue;
     network_list_.push_back(base::MakeUnique<NetworkInfo>(network->path()));
   }
 }
 
 void NetworkListView::UpdateNetworkIcons() {
   SCOPED_NET_LOG_IF_SLOW();
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
@@ skipping 33 matching lines @@
 void NetworkListView::UpdateNetworkListInternal() {
   SCOPED_NET_LOG_IF_SLOW();
   // Get the updated list entries
   network_map_.clear();
   std::set<std::string> new_service_paths;
   bool needs_relayout = UpdateNetworkListEntries(&new_service_paths);
 
   // Remove old children
   std::set<std::string> remove_service_paths;
   for (ServicePathMap::const_iterator it = service_path_map_.begin();
-       it != service_path_map_.end();
-       ++it) {
+       it != service_path_map_.end(); ++it) {
     if (new_service_paths.find(it->first) == new_service_paths.end()) {
       remove_service_paths.insert(it->first);
       network_map_.erase(it->second);
       delete it->second;
       needs_relayout = true;
     }
   }
 
   for (std::set<std::string>::const_iterator remove_it =
            remove_service_paths.begin();
-       remove_it != remove_service_paths.end();
-       ++remove_it) {
+       remove_it != remove_service_paths.end(); ++remove_it) {
     service_path_map_.erase(*remove_it);
   }
 
   if (needs_relayout)
     HandleRelayout();
 }
 
 void NetworkListView::HandleRelayout() {
   views::View* selected_view = nullptr;
   for (auto& iter : service_path_map_) {
@@ skipping 132 matching lines @@
     *label = nullptr;
     needs_relayout = true;
   }
   return needs_relayout;
 }
 
 void NetworkListView::NetworkIconChanged() {
   Update();
 }
 
-}  // namespace ui
+}  // namespace ash