summaryrefslogtreecommitdiffstats
path: root/ash/system/status_area_widget.cc
diff options
context:
space:
mode:
authorjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-23 21:16:51 +0000
committerjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-23 21:16:51 +0000
commitec9021849520dfccf8bc2644a6148aa5e17afc4b (patch)
tree881aa9caf49e6f0abfdeeb89ae9cc2ce9164fd63 /ash/system/status_area_widget.cc
parenta6ccb772bb875195a072cdb260d2b2ee24f43277 (diff)
downloadchromium_src-ec9021849520dfccf8bc2644a6148aa5e17afc4b.zip
chromium_src-ec9021849520dfccf8bc2644a6148aa5e17afc4b.tar.gz
chromium_src-ec9021849520dfccf8bc2644a6148aa5e17afc4b.tar.bz2
Add new vpn system tray ui. This implements most of the UI features, separate the VPN items out of general network configuration, adding a new uber tray item for vpn, etc. The network icon part for both Network and vpn still needs to be adjusted to meet M24 requirement.
Since we are going to refactor network library and deprecated many of the network API I used, I tried to make a minimum change to separate the vpn out of the general network settings. Please take a look to see if this will work as a short term workaround. BUG=129044 TBR=sky Review URL: https://codereview.chromium.org/11192061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/status_area_widget.cc')
-rw-r--r--ash/system/status_area_widget.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 515488c..38eb277 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -174,10 +174,16 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
bool large) OVERRIDE {
}
+ virtual void GetVirtualNetworkIcon(ash::NetworkIconInfo* info) OVERRIDE {
+ }
+
virtual void GetAvailableNetworks(
std::vector<NetworkIconInfo>* list) OVERRIDE {
}
+ virtual void GetVirtualNetworks(std::vector<NetworkIconInfo>* list) OVERRIDE {
+ }
+
virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
}
@@ -217,6 +223,9 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
virtual void ShowOtherWifi() OVERRIDE {
}
+ virtual void ShowOtherVPN() OVERRIDE {
+ }
+
virtual void ShowOtherCellular() OVERRIDE {
}