diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 21:16:51 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 21:16:51 +0000 |
| commit | ec9021849520dfccf8bc2644a6148aa5e17afc4b (patch) | |
| tree | 881aa9caf49e6f0abfdeeb89ae9cc2ce9164fd63 /ash/ash.gyp | |
| parent | a6ccb772bb875195a072cdb260d2b2ee24f43277 (diff) | |
| download | chromium_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/ash.gyp')
| -rw-r--r-- | ash/ash.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index b62b716..dca579a 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -158,11 +158,16 @@ 'system/brightness/tray_brightness.h', 'system/chromeos/keyboard_brightness_controller.cc', 'system/chromeos/keyboard_brightness_controller.h', + 'system/chromeos/network/netowrk_detailed_view.h', + 'system/chromeos/network/network_list_detailed_view_base.h', + 'system/chromeos/network/network_list_detailed_view_base.cc', 'system/chromeos/network/network_observer.h', 'system/chromeos/network/tray_network.cc', 'system/chromeos/network/tray_network.h', 'system/chromeos/network/tray_sms.cc', 'system/chromeos/network/tray_sms.h', + 'system/chromeos/network/tray_vpn.cc', + 'system/chromeos/network/tray_vpn.h', 'system/chromeos/tray_display.cc', 'system/chromeos/tray_display.h', 'system/date/clock_observer.h', |