summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 00:43:01 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 00:43:01 +0000
commitc47b7300a746a237d5641476132636f1ad0cc43c (patch)
tree46e34baa34ce6af51af9ba401a093fd2c18523a8 /ui
parente91185e7f3446ade0dc6c1c41e1cbfc34fb7d996 (diff)
downloadchromium_src-c47b7300a746a237d5641476132636f1ad0cc43c.zip
chromium_src-c47b7300a746a237d5641476132636f1ad0cc43c.tar.gz
chromium_src-c47b7300a746a237d5641476132636f1ad0cc43c.tar.bz2
ash: Make the rows in IME and bluetooth tray-popups larger.
Use an image-button to enable/disable bluetooth, and move it to the popup header. BUG=123916 TEST=none Review URL: https://chromiumcodereview.appspot.com/10041041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/resources/aura/status_bluetooth_disabled.pngbin0 -> 1019 bytes
-rw-r--r--ui/resources/aura/status_bluetooth_enabled.pngbin0 -> 1026 bytes
-rw-r--r--ui/resources/ui_resources.grd2
3 files changed, 2 insertions, 0 deletions
diff --git a/ui/resources/aura/status_bluetooth_disabled.png b/ui/resources/aura/status_bluetooth_disabled.png
new file mode 100644
index 0000000..ecd156d
--- /dev/null
+++ b/ui/resources/aura/status_bluetooth_disabled.png
Binary files differ
diff --git a/ui/resources/aura/status_bluetooth_enabled.png b/ui/resources/aura/status_bluetooth_enabled.png
new file mode 100644
index 0000000..04c481a
--- /dev/null
+++ b/ui/resources/aura/status_bluetooth_enabled.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 7321b5c..e18196a 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -331,6 +331,8 @@
<include name="IDR_AURA_UBER_TRAY_WIFI_DISABLED" file="aura/status_wifi_disabled.png" type="BINDATA" />
<include name="IDR_AURA_UBER_TRAY_CELLULAR_ENABLED" file="aura/status_cellular_enabled.png" type="BINDATA" />
<include name="IDR_AURA_UBER_TRAY_CELLULAR_DISABLED" file="aura/status_cellular_disabled.png" type="BINDATA" />
+ <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_ENABLED" file="aura/status_bluetooth_enabled.png" type="BINDATA" />
+ <include name="IDR_AURA_UBER_TRAY_BLUETOOTH_DISABLED" file="aura/status_bluetooth_disabled.png" type="BINDATA" />
<include name="IDR_AURA_SWITCH_MONITOR" file="aura/switch_monitor.png" type="BINDATA" />
<include name="IDR_OAK" file="oak.png" type="BINDATA"/>