Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Unified Diff: ash/system/chromeos/network/tray_network_state_observer.cc

Issue 11361274: Add NetworkStateListDetailedView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/network/tray_network_state_observer.h ('k') | ash/system/chromeos/network/tray_vpn.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..d0e2d65a2561be3b9db1e5e1090625c8b6a34dd5
--- /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() {
+ 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);
+ }
+ 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 chromeos::NetworkState* network) {
+ tray::NetworkDetailedView* detailed = tray_->detailed();
+ if (detailed)
+ detailed->NetworkServiceChanged(network);
+}
+
+} // namespace ash
+} // namespace internal
« no previous file with comments | « ash/system/chromeos/network/tray_network_state_observer.h ('k') | ash/system/chromeos/network/tray_vpn.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698