ash uber tray: Add the detailed network popup

chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
+#include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_controller.h"
 #include "ash/system/brightness/brightness_controller.h"
 #include "ash/system/network/network_controller.h"
 #include "ash/system/power/power_status_controller.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chrome/browser/chromeos/login/base_login_display_host.h"
+#include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/status/network_menu.h"
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
+#include "grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
+ash::NetworkIconInfo CreateNetworkIconInfo(const Network* network,
+                                           NetworkMenuIcon* network_icon) {
+  ash::NetworkIconInfo info;
+  info.name = UTF8ToUTF16(network->name());
+  info.image = network_icon->GetBitmap(network, NetworkMenuIcon::SIZE_SMALL);
+  info.unique_id = network->unique_id();
+  return info;
+}
+
 class SystemTrayDelegate : public ash::SystemTrayDelegate,
                            public AudioHandler::VolumeObserver,
                            public PowerManagerClient::Observer,
                            public NetworkMenuIcon::Delegate,
+                           public NetworkMenu::Delegate,
                            public NetworkLibrary::NetworkManagerObserver,
                            public NetworkLibrary::NetworkObserver,
                            public NetworkLibrary::CellularDataPlanObserver,
                            public content::NotificationObserver {
  public:
   explicit SystemTrayDelegate(ash::SystemTray* tray)
       : tray_(tray),
         network_icon_(ALLOW_THIS_IN_INITIALIZER_LIST(
-                      new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))) {
+                      new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
+        network_icon_large_(ALLOW_THIS_IN_INITIALIZER_LIST(
+                      new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
+        network_menu_(ALLOW_THIS_IN_INITIALIZER_LIST(new NetworkMenu(this))) {
     AudioHandler::GetInstance()->AddVolumeObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate(
         PowerManagerClient::UPDATE_USER);
 
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     crosnet->AddNetworkManagerObserver(this);
     OnNetworkManagerChanged(crosnet);
     crosnet->AddCellularDataPlanObserver(this);
 
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                    content::NotificationService::AllSources());
+
+    network_icon_large_->SetResourceSize(NetworkMenuIcon::SIZE_LARGE);
   }
 
   virtual ~SystemTrayDelegate() {
     AudioHandler* audiohandler = AudioHandler::GetInstance();
     if (audiohandler)
       audiohandler->RemoveVolumeObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   }
 
   // Overridden from ash::SystemTrayDelegate:
@@ skipping 14 matching lines @@
     if (!manager->IsUserLoggedIn())
       return ash::user::LOGGED_IN_NONE;
     if (manager->IsCurrentUserOwner())
       return ash::user::LOGGED_IN_OWNER;
     if (manager->IsLoggedInAsGuest())
       return ash::user::LOGGED_IN_GUEST;
     return ash::user::LOGGED_IN_USER;
   }
 
   virtual void ShowSettings() OVERRIDE {
-    BrowserList::GetLastActive()->OpenOptionsDialog();
+    GetAppropriateBrowser()->OpenOptionsDialog();
   }
 
   virtual void ShowDateSettings() OVERRIDE {
-    BrowserList::GetLastActive()->OpenAdvancedOptionsDialog();
+    GetAppropriateBrowser()->OpenAdvancedOptionsDialog();
+  }
+
+  virtual void ShowNetworkSettings() OVERRIDE {
+    GetAppropriateBrowser()->OpenInternetOptionsDialog();
   }
 
   virtual void ShowHelp() OVERRIDE {
-    BrowserList::GetLastActive()->ShowHelpTab();
+    GetAppropriateBrowser()->ShowHelpTab();
   }
 
   virtual bool IsAudioMuted() const OVERRIDE {
     return AudioHandler::GetInstance()->IsMuted();
   }
 
   virtual void SetAudioMuted(bool muted) OVERRIDE {
     return AudioHandler::GetInstance()->SetMuted(muted);
   }
 
@@ skipping 11 matching lines @@
 
   virtual void SignOut() OVERRIDE {
     BrowserList::AttemptUserExit();
   }
 
   virtual void RequestLockScreen() OVERRIDE {
     DBusThreadManager::Get()->GetPowerManagerClient()->
         NotifyScreenLockRequested();
   }
 
-  virtual ash::NetworkIconInfo GetMostRelevantNetworkIcon() OVERRIDE {
+  virtual ash::NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE {
     ash::NetworkIconInfo info;
-    info.image = network_icon_->GetIconAndText(&info.description);
+    info.image = !large ? network_icon_->GetIconAndText(&info.description) :
+        network_icon_large_->GetIconAndText(&info.description);
     return info;
   }
 
+  virtual void GetAvailableNetworks(
+      std::vector<ash::NetworkIconInfo>* list) OVERRIDE {
+    NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
+    crosnet->RequestNetworkScan();
+
+    // Ethernet.
+    if (crosnet->ethernet_enabled()) {
+      const EthernetNetwork* ethernet_network = crosnet->ethernet_network();
+      if (ethernet_network) {
+        ash::NetworkIconInfo info;
+        info.image = network_icon_->GetBitmap(ethernet_network,
+                                              NetworkMenuIcon::SIZE_SMALL);
+        if (!ethernet_network->name().empty())
+          info.name = UTF8ToUTF16(ethernet_network->name());
+        else
+          info.name =
+              l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
+        info.unique_id = ethernet_network->unique_id();
+        list->push_back(info);
+      }
+    }
+
+    // Wifi.
+    if (crosnet->wifi_available() && crosnet->wifi_enabled()) {
+      const WifiNetworkVector& wifi = crosnet->wifi_networks();
+      for (size_t i = 0; i < wifi.size(); ++i)
+        list->push_back(CreateNetworkIconInfo(wifi[i], network_icon_.get()));
+    }
+
+    // Cellular.
+    if (crosnet->cellular_available() && crosnet->cellular_enabled()) {
+      const CellularNetworkVector& cell = crosnet->cellular_networks();
+      for (size_t i = 0; i < cell.size(); ++i)
+        list->push_back(CreateNetworkIconInfo(cell[i], network_icon_.get()));
+    }
+
+    // VPN (only if logged in).
+    if (GetUserLoginStatus() == ash::user::LOGGED_IN_NONE)
+      return;
+    if (crosnet->connected_network() || crosnet->virtual_network_connected()) {
+      const VirtualNetworkVector& vpns = crosnet->virtual_networks();
+      for (size_t i = 0; i < vpns.size(); ++i)
+        list->push_back(CreateNetworkIconInfo(vpns[i], network_icon_.get()));
+    }
+  }
+
+  virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
+    NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
+    Network* network = crosnet->FindNetworkByUniqueId(network_id);
+    if (network)
+      network_menu_->ConnectToNetwork(network);
+  }
+
+  virtual void ToggleAirplaneMode() OVERRIDE {
+    NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
+    crosnet->EnableOfflineMode(!crosnet->offline_mode());
+  }
+
+  virtual void ChangeProxySettings() OVERRIDE {
+    CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE);
+    BaseLoginDisplayHost::default_host()->OpenProxySettings();
+  }
+
  private:
+  // Returns the last active browser. If there is no such browser, creates a new
+  // browser window with an empty tab and returns it.
+  Browser* GetAppropriateBrowser() {
+    Browser* browser = BrowserList::GetLastActive();
+    if (!browser)
+      browser = Browser::NewEmptyWindow(ProfileManager::GetDefaultProfile());
+    return browser;
+  }
+
   void NotifyRefreshNetwork() {
     ash::NetworkController* controller =
         ash::Shell::GetInstance()->network_controller();
     if (controller) {
       ash::NetworkIconInfo info;
       info.image = network_icon_->GetIconAndText(&info.description);
       controller->OnNetworkRefresh(info);
     }
   }
 
@@ skipping 40 matching lines @@
 
   virtual void UnlockScreen() OVERRIDE {
   }
 
   virtual void UnlockScreenFailed() OVERRIDE {
   }
 
   // TODO(sad): Override more from PowerManagerClient::Observer here (e.g.
   // PowerButtonStateChanged etc.).
 
-  // Overridden from StatusMenuIcon::Delegate.
+  // Overridden from NetworkMenuIcon::Delegate.
   virtual void NetworkMenuIconChanged() OVERRIDE {
     NotifyRefreshNetwork();
   }
 
+  // Overridden from NetworkMenu::Delegate.
+  virtual views::MenuButton* GetMenuButton() OVERRIDE {
+    return NULL;
+  }
+
+  virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE {
+    return ash::Shell::GetInstance()->GetContainer(

[Nikita (slow), 2012/03/13 18:01:15]

Shouldn't it be GetWidget()->GetNativeWindow()?

At the same time SettingBubbleContainer seems to be not correct container for
SystemTray which is located at kShellWindowId_StatusContainer.

[sadrul, 2012/03/13 18:06:22]

There is no GetWidget() here.

The tray is in StatusContainer, but the popups that show up when you click on it
are in SettingBubbleContainer.

It is possible that NetworkMenu will try to show one of the network-config
dialogs in the login/lock screen, and they need to show up above them.
SettingBubbleContainer is a relevant layer (it could also be
kShellWindowId_LockSystemModalContainer, I suppose).

[sadrul, 2012/03/13 18:41:02]

It does feel like LockSystemModalContainer is a better place for this. Made this
change.

+        ash::internal::kShellWindowId_SettingBubbleContainer);
+  }
+
+  virtual void OpenButtonOptions() OVERRIDE {
+  }
+
+  virtual bool ShouldOpenButtonOptions() const OVERRIDE {
+    return false;
+  }
+
   // Overridden from NetworkLibrary::NetworkManagerObserver.
   virtual void OnNetworkManagerChanged(NetworkLibrary* crosnet) OVERRIDE {
     RefreshNetworkObserver(crosnet);
     RefreshNetworkDeviceObserver(crosnet);
 
     // TODO: ShowOptionalMobileDataPromoNotification?
 
     NotifyRefreshNetwork();
   }
 
@@ skipping 17 matching lines @@
         tray_->UpdateAfterLoginStatusChange(GetUserLoginStatus());
         break;
       }
       default:
         NOTREACHED();
     }
   }
 
   ash::SystemTray* tray_;
   scoped_ptr<NetworkMenuIcon> network_icon_;
+  scoped_ptr<NetworkMenuIcon> network_icon_large_;
+  scoped_ptr<NetworkMenu> network_menu_;
   content::NotificationRegistrar registrar_;
   std::string cellular_device_path_;
   std::string active_network_path_;
+  scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos