diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 15:54:04 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-20 15:54:04 +0000 |
| commit | 1ef59610d05d8ce26508d715af83e569d92180ff (patch) | |
| tree | 764d501cbebc754f42ac643736f84d3f8839e8c6 /ash/resources/ash_resources.grd | |
| parent | d3059d0ea04e8a2132c5a6df452da4c523df7be3 (diff) | |
| download | chromium_src-1ef59610d05d8ce26508d715af83e569d92180ff.zip chromium_src-1ef59610d05d8ce26508d715af83e569d92180ff.tar.gz chromium_src-1ef59610d05d8ce26508d715af83e569d92180ff.tar.bz2 | |
Revert 174161
> Implemented tray notifications for enterprise enrolled devices.
>
>
> BUG=chromium-os:35755
> TBR=ben
>
> Review URL: https://chromiumcodereview.appspot.com/11594009
http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASAN%20Builder/builds/2567/steps/compile/logs/stdio
In file included from ../../ash/system/tray/system_tray_delegate.cc:7:
../../ash/system/tray/test_system_tray_delegate.h:33:17: error: [chromium-style] Overriding method must be marked with OVERRIDE.
virtual const string16 GetEnterpriseMessage() const;
In file included from ../../ash/system/tray/test_system_tray_delegate.cc:5:
../../ash/system/tray/test_system_tray_delegate.h:33:17: error: [chromium-style] Overriding method must be marked with OVERRIDE.
virtual const string16 GetEnterpriseMessage() const;
TBR=dzhioev@chromium.org
Review URL: https://codereview.chromium.org/11639044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/resources/ash_resources.grd')
| -rw-r--r-- | ash/resources/ash_resources.grd | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd index 60a0156..aa9ea59 100644 --- a/ash/resources/ash_resources.grd +++ b/ash/resources/ash_resources.grd @@ -160,30 +160,28 @@ <!-- ChromeOS specific icons --> <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRISE_LIGHT" file="cros/status_managed_tray.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRISE_DARK" file="cros/status_managed_p.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1X" file="cros/network/statusbar_network_1x.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_DARK" file="cros/network/statusbar_network_3g_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT" file="cros/network/statusbar_network_3g_light.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4G_DARK" file="cros/network/statusbar_network_4g_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4G_LIGHT" file="cros/network/statusbar_network_4g_light.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ARCS_DARK" file="cros/network/statusbar_network_arcs_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ARCS_LIGHT" file="cros/network/statusbar_network_arcs_light.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_DARK" file="cros/network/statusbar_network_bars_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_LIGHT" file="cros/network/statusbar_network_bars_light.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_DARK" file="cros/network/statusbar_network_edge_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT" file="cros/network/statusbar_network_edge_light.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_GPRS" file="cros/network/statusbar_network_gprs.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA" file="cros/network/statusbar_network_hspa.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS" file="cros/network/statusbar_network_hspa_plus.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE" file="cros/network/statusbar_network_lte.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED" file="cros/network/statusbar_network_lte_advanced.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK" file="cros/network/statusbar_network_roaming_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT" file="cros/network/statusbar_network_roaming_light.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK" file="cros/network/statusbar_network_secure_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_VPN" file="cros/network/statusbar_vpn_dark.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_VPN_BADGE" file="cros/network/statusbar_network_vpn_badge.png" /> - <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_WIRED" file="cros/network/statusbar_wired.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1X" file="cros/network/statusbar_network_1x.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_DARK" file="cros/network/statusbar_network_3g_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT" file="cros/network/statusbar_network_3g_light.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4G_DARK" file="cros/network/statusbar_network_4g_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_4G_LIGHT" file="cros/network/statusbar_network_4g_light.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ARCS_DARK" file="cros/network/statusbar_network_arcs_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ARCS_LIGHT" file="cros/network/statusbar_network_arcs_light.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_DARK" file="cros/network/statusbar_network_bars_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_BARS_LIGHT" file="cros/network/statusbar_network_bars_light.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_DARK" file="cros/network/statusbar_network_edge_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT" file="cros/network/statusbar_network_edge_light.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_GPRS" file="cros/network/statusbar_network_gprs.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA" file="cros/network/statusbar_network_hspa.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS" file="cros/network/statusbar_network_hspa_plus.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE" file="cros/network/statusbar_network_lte.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED" file="cros/network/statusbar_network_lte_advanced.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK" file="cros/network/statusbar_network_roaming_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT" file="cros/network/statusbar_network_roaming_light.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK" file="cros/network/statusbar_network_secure_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_VPN" file="cros/network/statusbar_vpn_dark.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_VPN_BADGE" file="cros/network/statusbar_network_vpn_badge.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_WIRED" file="cros/network/statusbar_wired.png" /> </if> <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_UPDATE" file="common/status_update.png" /> |