From bfb411316d5d6f6a29e01a88f7a94b545b827776 Mon Sep 17 00:00:00 2001
From: "sadrul@chromium.org"
 <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 27 Feb 2012 20:59:27 +0000
Subject: ash: A first step for the uber tray.

As a first step, there are items to open settings, help pages, and an item to
allow [un]muting volume.

The resources have not been uploaded yet. That will be done in a separate CL to
allow this one to go through trybots etc.

This new uber-tray can be turned on at runtime using --ash-uber-tray flag.

BUG=110130
TEST=none yet. will be added when a little more fleshed out.

Review URL: https://chromiumcodereview.appspot.com/9463039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123799 0039d316-1c4b-4281-b951-d872f2087c98
---
 ui/resources/ui_resources.grd | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui')

diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 4071819..6dad002 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -177,6 +177,10 @@
         <include name="IDR_AURA_WINDOW_TOP_LEFT" file="aura/window_top_left.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_TOP_RIGHT" file="aura/window_top_right.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_ZOOM_ICON" file="aura/slab_zoom.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME" file="aura/status_volume.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_VOLUME_MUTE" file="aura/status_volume_mute.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_BRIGHTNESS" file="aura/status_brightness.png" type="BINDATA" />
+        <include name="IDR_AURA_UBER_TRAY_SETTINGS" file="aura/status_settings.png" type="BINDATA" />
       </if>
     </includes>
   </release>
-- 
cgit v1.1