Move tray code from ui/chromeos/network/

ash/common/system/chromeos/network/tray_network.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 "ash/common/system/chromeos/network/tray_network.h"
 
 #include "ash/common/shelf/wm_shelf_util.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_icon_animation_observer.h"
 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/common/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_shell.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
-#include "grit/ui_chromeos_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/accessibility/ax_view_state.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_icon_animation_observer.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 using chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 using chromeos::NetworkTypePattern;
 
 namespace ash {
 namespace tray {
 
 class NetworkTrayView : public TrayItemView,
-                        public ui::network_icon::AnimationObserver {
+                        public network_icon::AnimationObserver {
  public:
   explicit NetworkTrayView(TrayNetwork* network_tray)
       : TrayItemView(network_tray) {
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
     image_view_ = new views::ImageView;
     AddChildView(image_view_);
 
     UpdateNetworkStateHandlerIcon();
   }
 
   ~NetworkTrayView() override {
-    ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+    network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   const char* GetClassName() const override { return "NetworkTrayView"; }
 
   void UpdateNetworkStateHandlerIcon() {
     NetworkStateHandler* handler =
         NetworkHandler::Get()->network_state_handler();
     gfx::ImageSkia image;
     base::string16 name;
     bool animating = false;
-    ui::network_icon::GetDefaultNetworkImageAndLabel(
-        ui::network_icon::ICON_TYPE_TRAY, &image, &name, &animating);
+    network_icon::GetDefaultNetworkImageAndLabel(network_icon::ICON_TYPE_TRAY,
+                                                 &image, &name, &animating);
     bool show_in_tray = !image.isNull();
     UpdateIcon(show_in_tray, image);
     if (animating)
-      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);
     // Update accessibility.
     const NetworkState* connected_network =
         handler->ConnectedNetworkByType(NetworkTypePattern::NonVirtual());
     if (connected_network) {
       UpdateConnectionStatus(base::UTF8ToUTF16(connected_network->name()),
                              true);
     } else {
       UpdateConnectionStatus(base::string16(), false);
     }
   }
 
   void UpdateAlignment(ShelfAlignment alignment) {
     SetLayoutManager(new views::BoxLayout(IsHorizontalAlignment(alignment)
                                               ? views::BoxLayout::kHorizontal
                                               : views::BoxLayout::kVertical,
                                           0, 0, 0));
     Layout();
   }
 
   // views::View:
   void GetAccessibleState(ui::AXViewState* state) override {
     state->name = connection_status_string_;
     state->role = ui::AX_ROLE_BUTTON;
   }
 
-  // ui::network_icon::AnimationObserver:
+  // network_icon::AnimationObserver:
   void NetworkIconChanged() override { UpdateNetworkStateHandlerIcon(); }
 
  private:
   // Updates connection status and notifies accessibility event when necessary.
   void UpdateConnectionStatus(const base::string16& network_name,
                               bool connected) {
     base::string16 new_connection_status_string;
     if (connected) {
       new_connection_status_string = l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED, network_name);
@@ skipping 11 matching lines @@
     SchedulePaint();
   }
 
   views::ImageView* image_view_;
   base::string16 connection_status_string_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkTrayView);
 };
 
 class NetworkDefaultView : public TrayItemMore,
-                           public ui::network_icon::AnimationObserver {
+                           public network_icon::AnimationObserver {
  public:
   NetworkDefaultView(TrayNetwork* network_tray, bool show_more)
       : TrayItemMore(network_tray, show_more) {
     Update();
   }
 
   ~NetworkDefaultView() override {
-    ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+    network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   void Update() {
     gfx::ImageSkia image;
     base::string16 label;
     bool animating = false;
     // TODO(bruthig): Update the image to use the proper color. See
     // https://crbug.com/632027.
-    ui::network_icon::GetDefaultNetworkImageAndLabel(
-        ui::network_icon::ICON_TYPE_DEFAULT_VIEW, &image, &label, &animating);
+    network_icon::GetDefaultNetworkImageAndLabel(
+        network_icon::ICON_TYPE_DEFAULT_VIEW, &image, &label, &animating);
     if (animating)
-      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);
     SetImage(image);
     SetLabel(label);
     SetAccessibleName(label);
   }
 
-  // ui::network_icon::AnimationObserver
+  // network_icon::AnimationObserver
   void NetworkIconChanged() override { Update(); }
 
  protected:
   // TrayItemMore:
   std::unique_ptr<TrayPopupItemStyle> CreateStyle() const override {
     // TODO(bruthig): Apply different ColorStyles based on network state. See
     // https://crbug.com/632027.
     return TrayItemMore::CreateStyle();
   }
 
@@ skipping 161 matching lines @@
 void TrayNetwork::NetworkStateChanged() {
   if (tray_)
     tray_->UpdateNetworkStateHandlerIcon();
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash