From 1ef59610d05d8ce26508d715af83e569d92180ff Mon Sep 17 00:00:00 2001 From: "erikwright@chromium.org" Date: Thu, 20 Dec 2012 15:54:04 +0000 Subject: 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 --- ash/resources/ash_resources.grd | 46 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'ash/resources/ash_resources.grd') 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1