Move tray code from ui/chromeos/network/

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

 // Copyright 2015 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 "ash/common/system/chromeos/network/vpn_list_view.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
+#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_icon_animation_observer.h"
+#include "ash/common/system/chromeos/network/network_list_delegate.h"
 #include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/chromeos/network/network_icon.h"
-#include "ui/chromeos/network/network_icon_animation.h"
-#include "ui/chromeos/network/network_icon_animation_observer.h"
-#include "ui/chromeos/network/network_list_delegate.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
@@ skipping 26 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VPNListProviderEntry);
 };
 
 // A list entry that represents a network. If the network is currently
 // connecting, the icon shown by this list entry will be animated. If the
 // network is currently connected, a disconnect button will be shown next to its
 // name.
 class VPNListNetworkEntry : public VPNListEntryBase,
-                            public ui::network_icon::AnimationObserver,
+                            public network_icon::AnimationObserver,
                             public views::ButtonListener {
  public:
   VPNListNetworkEntry(VPNListView* parent,
                       const chromeos::NetworkState* network);
   ~VPNListNetworkEntry() override;
 
-  // ui::network_icon::AnimationObserver:
+  // network_icon::AnimationObserver:
   void NetworkIconChanged() override;
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
  private:
   // A disconnect button that will be shown if the network is currently
   // connected. Updates the list entry's hover state as the mouse enters/exits
   // the button.
   class DisconnectButton : public TrayPopupLabelButton {
@@ skipping 34 matching lines @@
   label->SetBorder(views::Border::CreateEmptyBorder(5, 0, 5, 0));
 }
 
 VPNListNetworkEntry::VPNListNetworkEntry(VPNListView* parent,
                                          const chromeos::NetworkState* network)
     : VPNListEntryBase(parent), service_path_(network->path()) {
   UpdateFromNetworkState(network);
 }
 
 VPNListNetworkEntry::~VPNListNetworkEntry() {
-  ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+  network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 }
 
 void VPNListNetworkEntry::NetworkIconChanged() {
   UpdateFromNetworkState(
       chromeos::NetworkHandler::Get()->network_state_handler()->GetNetworkState(
           service_path_));
 }
 
 void VPNListNetworkEntry::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
@@ skipping 32 matching lines @@
   TrayPopupLabelButton::OnBoundsChanged(previous_bounds);
   if (IsMouseHovered()) {
     SetState(STATE_HOVERED);
     parent_->SetHoverHighlight(false);
   }
 }
 
 void VPNListNetworkEntry::UpdateFromNetworkState(
     const chromeos::NetworkState* network) {
   if (network && network->IsConnectingState())
-    ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
+    network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
   else
-    ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+    network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
 
   if (!network) {
     // This is a transient state where the network has been removed already but
     // the network list in the UI has not been updated yet.
     return;
   }
 
   RemoveAllChildViews(true);
   disconnect_button_ = nullptr;
 
-  AddIconAndLabel(ui::network_icon::GetImageForNetwork(
-                      network, ui::network_icon::ICON_TYPE_LIST),
-                  ui::network_icon::GetLabelForNetwork(
-                      network, ui::network_icon::ICON_TYPE_LIST),
-                  IsConnectedOrConnecting(network));
+  AddIconAndLabel(
+      network_icon::GetImageForNetwork(network, network_icon::ICON_TYPE_LIST),
+      network_icon::GetLabelForNetwork(network, network_icon::ICON_TYPE_LIST),
+      IsConnectedOrConnecting(network));
   if (IsConnectedOrConnecting(network)) {
     disconnect_button_ = new DisconnectButton(this);
     AddChildView(disconnect_button_);
     SetBorder(
         views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 3));
   } else {
     SetBorder(
         views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
   }
 
   // The icon and the disconnect button are always set to their preferred size.
   // All remaining space is used for the network name.
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 3, kTrayPopupPaddingBetweenItems);
   SetLayoutManager(layout);
   layout->SetDefaultFlex(0);
   layout->SetFlexForView(text_label(), 1);
   Layout();
 }
 
 }  // namespace
 
-VPNListView::VPNListView(ui::NetworkListDelegate* delegate)
-    : delegate_(delegate) {
+VPNListView::VPNListView(NetworkListDelegate* delegate) : delegate_(delegate) {
   WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->AddObserver(this);
 }
 
 VPNListView::~VPNListView() {
   // We need the check as on shell destruction, the delegate is destroyed first.
   SystemTrayDelegate* const system_tray_delegate =
       WmShell::Get()->system_tray_delegate();
   if (system_tray_delegate) {
     VPNDelegate* const vpn_delegate = system_tray_delegate->GetVPNDelegate();
     if (vpn_delegate)
@@ skipping 165 matching lines @@
     }
   }
 
   // Add providers without any configured networks, in the order that the
   // providers were returned by the extensions system.
   for (const VPNProvider& provider : providers)
     AddProviderAndNetworks(provider.key, provider.name, networks);
 }
 
 }  // namespace ash