Support toggling Wi-Fi with keyboard shortcut.

ash/system/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/network/tray_network.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 179 matching lines @@
         GetMostRelevantNetworkIcon(&info, true);
     SetImage(&info.image);
     SetLabel(info.description);
     SetAccessibleName(info.description);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkDefaultView);
 };
 
-class NetworkDetailedView : public TrayDetailsView,
-                            public views::ButtonListener,
-                            public ViewClickListener {
+class NetworkDetailedView : public TrayDetailsView {
  public:
-  explicit NetworkDetailedView(user::LoginStatus login)
+  NetworkDetailedView() {}
+
+  virtual ~NetworkDetailedView() {}
+
+  virtual TrayNetwork::DetailedViewType view_type() const = 0;

[stevenjb, 2012/08/02 19:55:56]

nit: I think this should be named GetViewType() since it is not just returning a
member.

[mazda, 2012/08/02 21:01:48]

Done.

+
+  virtual void Update() = 0;
+};
+
+class NetworkListDetailedView : public NetworkDetailedView,
+                                public views::ButtonListener,
+                                public ViewClickListener {
+ public:
+  NetworkListDetailedView(user::LoginStatus login)
       : login_(login),
         airplane_(NULL),
         info_icon_(NULL),
         button_wifi_(NULL),
         button_mobile_(NULL),
         view_mobile_account_(NULL),
         setup_mobile_account_(NULL),
         other_wifi_(NULL),
         other_mobile_(NULL),
         settings_(NULL),
         proxy_settings_(NULL),
         info_bubble_(NULL) {
     SystemTrayDelegate* delegate = Shell::GetInstance()->tray_delegate();
     delegate->RequestNetworkScan();
     CreateItems();
     Update();
   }
 
-  virtual ~NetworkDetailedView() {
+  virtual ~NetworkListDetailedView() {
     if (info_bubble_)
       info_bubble_->GetWidget()->CloseNow();
   }
 
   void CreateItems() {
     RemoveAllChildViews(true);
 
     airplane_ = NULL;
     info_icon_ = NULL;
     button_wifi_ = NULL;
     button_mobile_ = NULL;
     view_mobile_account_ = NULL;
     setup_mobile_account_ = NULL;
     other_wifi_ = NULL;
     other_mobile_ = NULL;
     settings_ = NULL;
     proxy_settings_ = NULL;
 
     AppendNetworkEntries();
     AppendNetworkExtra();
     AppendHeaderEntry();
     AppendHeaderButtons();
 
     Update();
   }
 
-  void Update() {
+  // Overridden from NetworkDetailedView:
+  virtual TrayNetwork::DetailedViewType view_type() const OVERRIDE {
+    return TrayNetwork::LIST_VIEW;
+  }
+
+  virtual void Update() OVERRIDE {
     UpdateHeaderButtons();
     UpdateNetworkEntries();
     UpdateNetworkExtra();
 
     Layout();
   }
 
  private:
   void AppendHeaderEntry() {
     CreateSpecialRow(IDS_ASH_STATUS_TRAY_NETWORK, this);
@@ skipping 340 matching lines @@
   TrayPopupHeaderButton* button_mobile_;
   views::View* view_mobile_account_;
   views::View* setup_mobile_account_;
   TrayPopupTextButton* other_wifi_;
   TrayPopupTextButton* other_mobile_;
   TrayPopupTextButton* settings_;
   TrayPopupTextButton* proxy_settings_;
 
   views::BubbleDelegateView* info_bubble_;
 
-  DISALLOW_COPY_AND_ASSIGN(NetworkDetailedView);
+  DISALLOW_COPY_AND_ASSIGN(NetworkListDetailedView);
+};
+
+class NetworkWifiDetailedView : public NetworkDetailedView {
+ public:
+  explicit NetworkWifiDetailedView(bool wifi_enabled) {
+    SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
+                                          kTrayPopupPaddingHorizontal,
+                                          10,
+                                          kTrayPopupPaddingBetweenItems));
+    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+    views::ImageView* image = new views::ImageView;
+    const int image_id = wifi_enabled ?
+        IDR_AURA_UBER_TRAY_WIFI_ENABLED : IDR_AURA_UBER_TRAY_WIFI_DISABLED;
+    image->SetImage(bundle.GetImageNamed(image_id).ToImageSkia());
+    AddChildView(image);
+
+    const int string_id = wifi_enabled ?
+        IDS_ASH_STATUS_TRAY_NETWORK_WIFI_ENABLED:
+        IDS_ASH_STATUS_TRAY_NETWORK_WIFI_DISABLED;
+    views::Label* label =
+        new views::Label(bundle.GetLocalizedString(string_id));
+    label->SetMultiLine(true);
+    label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+    AddChildView(label);
+  }
+
+  virtual ~NetworkWifiDetailedView() {}
+
+  // Overridden from NetworkDetailedView:
+  virtual TrayNetwork::DetailedViewType view_type() const OVERRIDE {
+    return TrayNetwork::WIFI_VIEW;
+  }
+
+  virtual void Update() OVERRIDE {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NetworkWifiDetailedView);
 };
 
 class NetworkErrorView : public views::View,
                          public views::LinkListener {
  public:
   NetworkErrorView(TrayNetwork* tray,
                    TrayNetwork::ErrorType error_type,
                    const NetworkErrors::Message& error)
       : tray_(tray),
         error_type_(error_type) {
@@ skipping 83 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(NetworkNotificationView);
 };
 
 }  // namespace tray
 
 TrayNetwork::TrayNetwork()
     : tray_(NULL),
       default_(NULL),
       detailed_(NULL),
       notification_(NULL),
-      errors_(new tray::NetworkErrors()) {
+      errors_(new tray::NetworkErrors()),
+      request_wifi_view_(false) {
 }
 
 TrayNetwork::~TrayNetwork() {
 }
 
 views::View* TrayNetwork::CreateTrayView(user::LoginStatus status) {
   CHECK(tray_ == NULL);
   tray_ = new tray::NetworkTrayView(tray::LIGHT, true /*tray_icon*/);
   return tray_;
 }
 
 views::View* TrayNetwork::CreateDefaultView(user::LoginStatus status) {
   CHECK(default_ == NULL);
   default_ = new tray::NetworkDefaultView(this);
   return default_;
 }
 
 views::View* TrayNetwork::CreateDetailedView(user::LoginStatus status) {
   CHECK(detailed_ == NULL);
-  detailed_ = new tray::NetworkDetailedView(status);
+  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(!delegate->GetWifiEnabled());
+    request_wifi_view_ = false;
+  } else {
+    detailed_ = new tray::NetworkListDetailedView(status);
+  }
   return detailed_;
 }
 
 views::View* TrayNetwork::CreateNotificationView(user::LoginStatus status) {
   CHECK(notification_ == NULL);
   if (errors_->messages().empty())
     return NULL;  // Error has already been cleared.
   notification_ = new tray::NetworkNotificationView(this);
   return notification_;
 }
@@ skipping 49 matching lines @@
     if (notification_)
       HideNotificationView();
     return;
   }
   if (notification_)
     notification_->Update();
   else
     ShowNotificationView();
 }
 
+void TrayNetwork::OnWillToggleWifi() {
+  if (!detailed_ || detailed_->view_type() == WIFI_VIEW) {
+    request_wifi_view_ = true;
+    PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
+  }
+}
+
 void TrayNetwork::LinkClicked(ErrorType error_type) {
   tray::NetworkErrors::ErrorMap::const_iterator iter =
       errors()->messages().find(error_type);
   if (iter != errors()->messages().end() && iter->second.delegate)
     iter->second.delegate->NotificationLinkClicked();
 }
 
 }  // namespace internal
 }  // namespace ash