Add NetworkStateListDetailedView

ash/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/system/chromeos/network/tray_network.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_list_detailed_view_base.h"
+#include "ash/system/chromeos/network/network_state_list_detailed_view.h"
+#include "ash/system/chromeos/network/tray_network_state_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ash/system/tray/tray_notification_view.h"
+#include "base/command_line.h"
+#include "chromeos/chromeos_switches.h"
+#include "chromeos/network/network_state_handler.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace {
 
 using ash::internal::TrayNetwork;
 
@@ skipping 53 matching lines @@
 
   MessageMap& messages() { return messages_; }
   const MessageMap& messages() const { return messages_; }
 
  private:
   MessageMap messages_;
 };
 
 class NetworkTrayView : public TrayItemView {
  public:
-  NetworkTrayView(SystemTrayItem* owner, ColorTheme size, bool tray_icon)
-      : TrayItemView(owner), color_theme_(size), tray_icon_(tray_icon) {
+  NetworkTrayView(SystemTrayItem* owner, ColorTheme size)
+      : TrayItemView(owner), color_theme_(size) {
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
 
     image_view_ = color_theme_ == DARK ?
         new FixedSizedImageView(0, kTrayPopupItemHeight) :
         new views::ImageView;
     AddChildView(image_view_);
 
     NetworkIconInfo info;
     Shell::GetInstance()->tray_delegate()->
         GetMostRelevantNetworkIcon(&info, false);
     Update(info);
   }
 
   virtual ~NetworkTrayView() {}
 
   void Update(const NetworkIconInfo& info) {
     image_view_->SetImage(info.image);
-    if (tray_icon_)
-      SetVisible(info.tray_icon_visible);
+    SetVisible(info.tray_icon_visible);
     SchedulePaint();
   }
 
  private:
   views::ImageView* image_view_;
   ColorTheme color_theme_;
-  bool tray_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkTrayView);
 };
 
 class NetworkDefaultView : public TrayItemMore {
  public:
   NetworkDefaultView(SystemTrayItem* owner, bool show_more)
       : TrayItemMore(owner, show_more) {
     Update();
   }
@@ skipping 269 matching lines @@
 
   // Overridden from NetworkDetailedView:
 
   virtual void Init() OVERRIDE {
   }
 
   virtual NetworkDetailedView::DetailedViewType GetViewType() const OVERRIDE {
     return NetworkDetailedView::WIFI_VIEW;
   }
 
-  virtual void Update() OVERRIDE {}
+  virtual void ManagerChanged() OVERRIDE {
+  }
+
+  virtual void NetworkListChanged(const NetworkStateList& networks) OVERRIDE {
+  }
+
+  virtual void NetworkServiceChanged(
+      const chromeos::NetworkState* network) OVERRIDE {
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkWifiDetailedView);
 };
 
 class NetworkMessageView : public views::View,
                            public views::LinkListener {
  public:
   NetworkMessageView(TrayNetwork* owner,
                      TrayNetwork::MessageType message_type,
@@ skipping 103 matching lines @@
 }  // namespace tray
 
 TrayNetwork::TrayNetwork(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
       tray_(NULL),
       default_(NULL),
       detailed_(NULL),
       notification_(NULL),
       messages_(new tray::NetworkMessages()),
       request_wifi_view_(false) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kEnableNewNetworkHandlers)) {
+    network_state_observer_.reset(new TrayNetworkStateObserver(this));
+  }
 }
 
 TrayNetwork::~TrayNetwork() {
 }
 
 views::View* TrayNetwork::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_ == NULL);
-  tray_ = new tray::NetworkTrayView(this, tray::LIGHT, true /*tray_icon*/);
+  tray_ = new tray::NetworkTrayView(this, tray::LIGHT);
   return tray_;
 }
 
 views::View* TrayNetwork::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
   default_ =
       new tray::NetworkDefaultView(this, status != user::LOGGED_IN_LOCKED);
   return default_;
 }
 
 views::View* TrayNetwork::CreateDetailedView(user::LoginStatus status) {
   CHECK(detailed_ == NULL);
   // Clear any notifications when showing the detailed view.
   messages_->messages().clear();
   HideNotificationView();
   if (request_wifi_view_) {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     // The Wi-Fi state is not toggled yet at this point.
     detailed_ = new tray::NetworkWifiDetailedView(this,
                                                   !delegate->GetWifiEnabled());
     request_wifi_view_ = false;
   } else {
-    detailed_ = new tray::NetworkListDetailedView(
-        this, status, IDS_ASH_STATUS_TRAY_NETWORK);
+    if (CommandLine::ForCurrentProcess()->HasSwitch(
+            chromeos::switches::kEnableNewNetworkHandlers)) {
+      detailed_ = new tray::NetworkStateListDetailedView(this, status);
+    } else {
+      detailed_ = new tray::NetworkListDetailedView(
+          this, status, IDS_ASH_STATUS_TRAY_NETWORK);
+    }
     detailed_->Init();
   }
   return detailed_;
 }
 
 views::View* TrayNetwork::CreateNotificationView(user::LoginStatus status) {
   CHECK(notification_ == NULL);
   if (messages_->messages().empty())
     return NULL;  // Message has already been cleared.
   notification_ = new tray::NetworkNotificationView(this);
@@ skipping 22 matching lines @@
 void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   SetTrayImageItemBorder(tray_, alignment);
 }
 
 void TrayNetwork::OnNetworkRefresh(const NetworkIconInfo& info) {
   if (tray_)
     tray_->Update(info);
   if (default_)
     default_->Update();
   if (detailed_)
-    detailed_->Update();
+    detailed_->ManagerChanged();
 }
 
 void TrayNetwork::SetNetworkMessage(NetworkTrayDelegate* delegate,
                                    MessageType message_type,
                                    NetworkType network_type,
                                    const string16& title,
                                    const string16& message,
                                    const std::vector<string16>& links) {
   messages_->messages()[message_type] = tray::NetworkMessages::Message(
       delegate, network_type, title, message, links);
   if (notification_)
     notification_->Update();
   else
     ShowNotificationView();
 }
 
 void TrayNetwork::ClearNetworkMessage(MessageType message_type) {
   messages_->messages().erase(message_type);
   if (messages_->messages().empty()) {
     HideNotificationView();
     return;
   }
   if (notification_)
     notification_->Update();
   else
     ShowNotificationView();
 }
 
 void TrayNetwork::OnWillToggleWifi() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          chromeos::switches::kEnableNewNetworkHandlers)) {
+    return;  // Handled in TrayNetworkStateObserver::NetworkManagerChanged()
+  }
   if (!detailed_ ||
       detailed_->GetViewType() == tray::NetworkDetailedView::WIFI_VIEW) {
     request_wifi_view_ = true;
     PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
   }
 }
 
 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) {
   tray::NetworkMessages::MessageMap::const_iterator iter =
       messages()->messages().find(message_type);
   if (iter != messages()->messages().end() && iter->second.delegate)
     iter->second.delegate->NotificationLinkClicked(link_id);
 }
 
 }  // namespace internal
 }  // namespace ash