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 687 matching lines @@
         tray_network()->errors()->messages().begin();
     network_error_view_ =
         new NetworkErrorView(tray_network(), iter->first, iter->second);
   }
 
   tray::NetworkErrorView* network_error_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkNotificationView);
 };
 
+class NetworkWifiDetailedView : public TrayDetailsView {
+ 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() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NetworkWifiDetailedView);
+};
+
 }  // namespace tray
 
 TrayNetwork::TrayNetwork()
     : tray_(NULL),
       default_(NULL),
       detailed_(NULL),
+      wifi_view_(NULL),
       notification_(NULL),
       errors_(new tray::NetworkErrors()) {
 }
 
 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) {
+  if (wifi_view_) {
+    views::View* returned_view = wifi_view_;
+    wifi_view_ = NULL;
+    return returned_view;

[stevenjb, 2012/08/02 17:47:16]

This logic is pretty confusing. I think we would be better setting a bool
'request_wifi_view_' and use that to determine which type of view to create
here.

[mazda, 2012/08/02 19:49:16]

Done.

+  }
+
   CHECK(detailed_ == NULL);
   detailed_ = new tray::NetworkDetailedView(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);
@@ skipping 51 matching lines @@
     if (notification_)
       HideNotificationView();
     return;
   }
   if (notification_)
     notification_->Update();
   else
     ShowNotificationView();
 }
 
+void TrayNetwork::OnWifiToggled(bool wifi_enabled) {
+  if (!detailed_) {
+    wifi_view_ = new tray::NetworkWifiDetailedView(wifi_enabled);
+    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