Add NetworkStateListDetailedView

ash/system/chromeos/network/tray_network_state_observer.cc

Index: ash/system/chromeos/network/tray_network_state_observer.cc
diff --git a/ash/system/chromeos/network/tray_network_state_observer.cc b/ash/system/chromeos/network/tray_network_state_observer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6aae0c0d82f1797c04ac9953a3bddc391b03c45e
--- /dev/null
+++ b/ash/system/chromeos/network/tray_network_state_observer.cc
@@ -0,0 +1,57 @@
+// 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_state_observer.h"
+
+#include "ash/system/chromeos/network/network_detailed_view.h"
+#include "ash/system/chromeos/network/tray_network.h"
+#include "ash/system/tray/tray_constants.h"
+#include "chromeos/network/network_state_handler.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
+
+namespace ash {
+namespace internal {
+
+TrayNetworkStateObserver::TrayNetworkStateObserver(TrayNetwork* tray)
+    : tray_(tray),
+      wifi_state_(WIFI_UNKNOWN) {
+  chromeos::NetworkStateHandler::Get()->AddObserver(this);
+}
+
+TrayNetworkStateObserver::~TrayNetworkStateObserver() {
+  chromeos::NetworkStateHandler::Get()->RemoveObserver(this);
+}
+
+void TrayNetworkStateObserver::NetworkManagerChanged(
+    const std::string& property) {
+  tray::NetworkDetailedView* detailed = tray_->detailed();
+  bool wifi_enabled = chromeos::NetworkStateHandler::Get()->
+      TechnologyEnabled(flimflam::kTypeWifi);
+  WifiState wifi_state = wifi_enabled ? WIFI_ENABLED : WIFI_DISABLED;
+  if ((wifi_state_ != WIFI_UNKNOWN && wifi_state_ != wifi_state) &&
+      (!detailed ||
+       detailed->GetViewType() == tray::NetworkDetailedView::WIFI_VIEW)) {
+    tray_->set_request_wifi_view(true);
+    tray_->PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);

[jennyz, 2012/11/27 01:43:52]

Is this a new UI feature for popping up detailed network view when wifi is
changed to enabled state, or it just matches an exisiting UI feature?

[stevenjb, 2012/11/27 17:20:32]

This replaces TrayNetwork::OnWillToggleWifi() which will become deprecated. I
added a test in OnWillToggleWifi() to ensure that we don't call this twice.

+  }
+  wifi_state_ = wifi_state;
+  if (detailed)
+    detailed->ManagerChanged();
+}
+
+void TrayNetworkStateObserver::NetworkListChanged(
+    const NetworkStateList& networks) {
+  tray::NetworkDetailedView* detailed = tray_->detailed();
+  if (detailed)
+    detailed->NetworkListChanged(networks);
+}
+
+void TrayNetworkStateObserver::NetworkServiceChanged(const std::string& path) {
+  tray::NetworkDetailedView* detailed = tray_->detailed();
+  if (detailed)
+    detailed->NetworkServiceChanged(path);
+}
+
+}  // namespace ash
+}  // namespace internal