New button scheme...borders are separate from the inner contents so

that they can be highlighted / depressed independently.

Got alignment of buttons right.

Support hover and pushed in StatusAreaButton.

Share status area button code.

New icons for battery and wifi.

New images.

Review URL: http://codereview.chromium.org/300018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29651 0039d316-1c4b-4281-b951-d872f2087c98

56 files changed, 21 insertions, 1 deletions

diff --git a/chrome/app/theme/statusbar_battery10c.png b/chrome/app/theme/statusbar_battery10c.png
new file mode 100644
index 0000000..5150982
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery10c.png
diff --git a/chrome/app/theme/statusbar_battery10d.png b/chrome/app/theme/statusbar_battery10d.png
new file mode 100644
index 0000000..4915275
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery10d.png
diff --git a/chrome/app/theme/statusbar_battery11c.png b/chrome/app/theme/statusbar_battery11c.png
new file mode 100644
index 0000000..7063619
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery11c.png
diff --git a/chrome/app/theme/statusbar_battery11d.png b/chrome/app/theme/statusbar_battery11d.png
new file mode 100644
index 0000000..8dc2eb3
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery11d.png
diff --git a/chrome/app/theme/statusbar_battery12c.png b/chrome/app/theme/statusbar_battery12c.png
new file mode 100644
index 0000000..85069aa
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery12c.png
diff --git a/chrome/app/theme/statusbar_battery12d.png b/chrome/app/theme/statusbar_battery12d.png
new file mode 100644
index 0000000..ce130db
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery12d.png
diff --git a/chrome/app/theme/statusbar_battery13c.png b/chrome/app/theme/statusbar_battery13c.png
new file mode 100644
index 0000000..08cc139
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery13c.png
diff --git a/chrome/app/theme/statusbar_battery13d.png b/chrome/app/theme/statusbar_battery13d.png
new file mode 100644
index 0000000..c63dda7
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery13d.png
diff --git a/chrome/app/theme/statusbar_battery14c.png b/chrome/app/theme/statusbar_battery14c.png
new file mode 100644
index 0000000..0874a9e
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery14c.png
diff --git a/chrome/app/theme/statusbar_battery14d.png b/chrome/app/theme/statusbar_battery14d.png
new file mode 100644
index 0000000..9620a68
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery14d.png
diff --git a/chrome/app/theme/statusbar_battery15c.png b/chrome/app/theme/statusbar_battery15c.png
new file mode 100644
index 0000000..4ab3e48
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery15c.png
diff --git a/chrome/app/theme/statusbar_battery15d.png b/chrome/app/theme/statusbar_battery15d.png
new file mode 100644
index 0000000..d377e6d
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery15d.png
diff --git a/chrome/app/theme/statusbar_battery16c.png b/chrome/app/theme/statusbar_battery16c.png
new file mode 100644
index 0000000..ec1c311
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery16c.png
diff --git a/chrome/app/theme/statusbar_battery16d.png b/chrome/app/theme/statusbar_battery16d.png
new file mode 100644
index 0000000..345c528
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery16d.png
diff --git a/chrome/app/theme/statusbar_battery1c.png b/chrome/app/theme/statusbar_battery1c.png
index d812f0b..ed662bf 100644
--- a/chrome/app/theme/statusbar_battery1c.png
+++ b/chrome/app/theme/statusbar_battery1c.png
diff --git a/chrome/app/theme/statusbar_battery1d.png b/chrome/app/theme/statusbar_battery1d.png
index b28b2b7..061791c 100644
--- a/chrome/app/theme/statusbar_battery1d.png
+++ b/chrome/app/theme/statusbar_battery1d.png
diff --git a/chrome/app/theme/statusbar_battery2c.png b/chrome/app/theme/statusbar_battery2c.png
index a5c1a5b..ac185bc 100644
--- a/chrome/app/theme/statusbar_battery2c.png
+++ b/chrome/app/theme/statusbar_battery2c.png
diff --git a/chrome/app/theme/statusbar_battery2d.png b/chrome/app/theme/statusbar_battery2d.png
index 6256707..e0a0695 100644
--- a/chrome/app/theme/statusbar_battery2d.png
+++ b/chrome/app/theme/statusbar_battery2d.png
diff --git a/chrome/app/theme/statusbar_battery3c.png b/chrome/app/theme/statusbar_battery3c.png
index 42886ed..a03f57e 100644
--- a/chrome/app/theme/statusbar_battery3c.png
+++ b/chrome/app/theme/statusbar_battery3c.png
diff --git a/chrome/app/theme/statusbar_battery3d.png b/chrome/app/theme/statusbar_battery3d.png
index 4657493..5a2dc11 100644
--- a/chrome/app/theme/statusbar_battery3d.png
+++ b/chrome/app/theme/statusbar_battery3d.png
diff --git a/chrome/app/theme/statusbar_battery4c.png b/chrome/app/theme/statusbar_battery4c.png
index 1f90b72..a20ddbb 100644
--- a/chrome/app/theme/statusbar_battery4c.png
+++ b/chrome/app/theme/statusbar_battery4c.png
diff --git a/chrome/app/theme/statusbar_battery4d.png b/chrome/app/theme/statusbar_battery4d.png
index d78b44d..9cadf16 100644
--- a/chrome/app/theme/statusbar_battery4d.png
+++ b/chrome/app/theme/statusbar_battery4d.png
diff --git a/chrome/app/theme/statusbar_battery5c.png b/chrome/app/theme/statusbar_battery5c.png
index 5eb5aa8..01946a5 100644
--- a/chrome/app/theme/statusbar_battery5c.png
+++ b/chrome/app/theme/statusbar_battery5c.png
diff --git a/chrome/app/theme/statusbar_battery5d.png b/chrome/app/theme/statusbar_battery5d.png
index 91b0ae7..6ddda93 100644
--- a/chrome/app/theme/statusbar_battery5d.png
+++ b/chrome/app/theme/statusbar_battery5d.png
diff --git a/chrome/app/theme/statusbar_battery6c.png b/chrome/app/theme/statusbar_battery6c.png
index 922cda8..93c05d6 100644
--- a/chrome/app/theme/statusbar_battery6c.png
+++ b/chrome/app/theme/statusbar_battery6c.png
diff --git a/chrome/app/theme/statusbar_battery6d.png b/chrome/app/theme/statusbar_battery6d.png
index 83e3f1a..015a270 100644
--- a/chrome/app/theme/statusbar_battery6d.png
+++ b/chrome/app/theme/statusbar_battery6d.png
diff --git a/chrome/app/theme/statusbar_battery7c.png b/chrome/app/theme/statusbar_battery7c.png
index 23202cd..d9d5c6c 100644
--- a/chrome/app/theme/statusbar_battery7c.png
+++ b/chrome/app/theme/statusbar_battery7c.png
diff --git a/chrome/app/theme/statusbar_battery7d.png b/chrome/app/theme/statusbar_battery7d.png
index b778cb9..ee65b33 100644
--- a/chrome/app/theme/statusbar_battery7d.png
+++ b/chrome/app/theme/statusbar_battery7d.png
diff --git a/chrome/app/theme/statusbar_battery8c.png b/chrome/app/theme/statusbar_battery8c.png
index 68649f6..529dfbf 100644
--- a/chrome/app/theme/statusbar_battery8c.png
+++ b/chrome/app/theme/statusbar_battery8c.png
diff --git a/chrome/app/theme/statusbar_battery8d.png b/chrome/app/theme/statusbar_battery8d.png
index 7c9a344..0975111 100644
--- a/chrome/app/theme/statusbar_battery8d.png
+++ b/chrome/app/theme/statusbar_battery8d.png
diff --git a/chrome/app/theme/statusbar_battery9c.png b/chrome/app/theme/statusbar_battery9c.png
new file mode 100644
index 0000000..f0f2972
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery9c.png
diff --git a/chrome/app/theme/statusbar_battery9d.png b/chrome/app/theme/statusbar_battery9d.png
new file mode 100644
index 0000000..5620cd1
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery9d.png
diff --git a/chrome/app/theme/statusbar_battery_charged.png b/chrome/app/theme/statusbar_battery_charged.png
index 409825b..d052c1b 100644
--- a/chrome/app/theme/statusbar_battery_charged.png
+++ b/chrome/app/theme/statusbar_battery_charged.png
diff --git a/chrome/app/theme/statusbar_battery_missing.png b/chrome/app/theme/statusbar_battery_missing.png
new file mode 100644
index 0000000..4117402
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery_missing.png
diff --git a/chrome/app/theme/statusbar_battery_unknown.png b/chrome/app/theme/statusbar_battery_unknown.png
index 0c19337..1c68ee6 100755..100644
--- a/chrome/app/theme/statusbar_battery_unknown.png
+++ b/chrome/app/theme/statusbar_battery_unknown.png
diff --git a/chrome/app/theme/statusbar_container.png b/chrome/app/theme/statusbar_container.png
new file mode 100644
index 0000000..5b480d0
--- /dev/null
+++ b/chrome/app/theme/statusbar_container.png
diff --git a/chrome/app/theme/statusbar_container_hover.png b/chrome/app/theme/statusbar_container_hover.png
new file mode 100644
index 0000000..210fe5d
--- /dev/null
+++ b/chrome/app/theme/statusbar_container_hover.png
diff --git a/chrome/app/theme/statusbar_container_pressed.png b/chrome/app/theme/statusbar_container_pressed.png
new file mode 100755
index 0000000..df59803
--- /dev/null
+++ b/chrome/app/theme/statusbar_container_pressed.png
diff --git a/chrome/app/theme/statusbar_menu.png b/chrome/app/theme/statusbar_menu.png
index 4edd2e4..a0aba01 100644
--- a/chrome/app/theme/statusbar_menu.png
+++ b/chrome/app/theme/statusbar_menu.png
diff --git a/chrome/app/theme/statusbar_network_disconnected.png b/chrome/app/theme/statusbar_network_disconnected.png
new file mode 100644
index 0000000..4ca63e3
--- /dev/null
+++ b/chrome/app/theme/statusbar_network_disconnected.png
diff --git a/chrome/app/theme/statusbar_wifi_dot.png b/chrome/app/theme/statusbar_wifi_dot.png
new file mode 100644
index 0000000..76d6186
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_dot.png
diff --git a/chrome/app/theme/statusbar_wifi_down1.png b/chrome/app/theme/statusbar_wifi_down1.png
new file mode 100644
index 0000000..ab31a97
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_down1.png
diff --git a/chrome/app/theme/statusbar_wifi_down1p.png b/chrome/app/theme/statusbar_wifi_down1p.png
new file mode 100644
index 0000000..f961eb1
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_down1p.png
diff --git a/chrome/app/theme/statusbar_wifi_down2.png b/chrome/app/theme/statusbar_wifi_down2.png
new file mode 100644
index 0000000..8ad080c
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_down2.png
diff --git a/chrome/app/theme/statusbar_wifi_down2p.png b/chrome/app/theme/statusbar_wifi_down2p.png
new file mode 100644
index 0000000..862fd52
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_down2p.png
diff --git a/chrome/app/theme/statusbar_wifi_down3.png b/chrome/app/theme/statusbar_wifi_down3.png
new file mode 100644
index 0000000..4c9eb46
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_down3.png
diff --git a/chrome/app/theme/statusbar_wifi_down3p.png b/chrome/app/theme/statusbar_wifi_down3p.png
new file mode 100644
index 0000000..959a797
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_down3p.png
diff --git a/chrome/app/theme/statusbar_wifi_up1.png b/chrome/app/theme/statusbar_wifi_up1.png
new file mode 100644
index 0000000..2e80214
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_up1.png
diff --git a/chrome/app/theme/statusbar_wifi_up1p.png b/chrome/app/theme/statusbar_wifi_up1p.png
new file mode 100644
index 0000000..b86496c
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_up1p.png
diff --git a/chrome/app/theme/statusbar_wifi_up2.png b/chrome/app/theme/statusbar_wifi_up2.png
new file mode 100644
index 0000000..db21721
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_up2.png
diff --git a/chrome/app/theme/statusbar_wifi_up2p.png b/chrome/app/theme/statusbar_wifi_up2p.png
new file mode 100644
index 0000000..15bacc1
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_up2p.png
diff --git a/chrome/app/theme/statusbar_wifi_up3.png b/chrome/app/theme/statusbar_wifi_up3.png
new file mode 100644
index 0000000..5789483
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_up3.png
diff --git a/chrome/app/theme/statusbar_wifi_up3p.png b/chrome/app/theme/statusbar_wifi_up3p.png
new file mode 100644
index 0000000..871d0e9
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_up3p.png
diff --git a/chrome/app/theme/statusbar_wifi_warning.png b/chrome/app/theme/statusbar_wifi_warning.png
new file mode 100644
index 0000000..d033ec2
--- /dev/null
+++ b/chrome/app/theme/statusbar_wifi_warning.png
diff --git a/chrome/app/theme/statusbar_wired.png b/chrome/app/theme/statusbar_wired.png
index ac8415d..c7e03de 100755..100644
--- a/chrome/app/theme/statusbar_wired.png
+++ b/chrome/app/theme/statusbar_wired.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 339585f..cba0fff 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -358,8 +358,12 @@
         <include name="IDR_COMPACTNAV_SEPARATOR" file="compactnav_separator.png" type="BINDATA" />
  
         <include name="IDR_STATUSBAR_MENU" file="statusbar_menu.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_CONTAINER" file="statusbar_container.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_CONTAINER_HOVER" file="statusbar_container_hover.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_CONTAINER_PRESSED" file="statusbar_container_pressed.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_CHARGED" file="statusbar_battery_charged.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_UNKNOWN" file="statusbar_battery_unknown.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_MISSING" file="statusbar_battery_missing.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_CHARGING_1" file="statusbar_battery1c.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_CHARGING_2" file="statusbar_battery2c.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_CHARGING_3" file="statusbar_battery3c.png" type="BINDATA" />
@@ -368,6 +372,14 @@
         <include name="IDR_STATUSBAR_BATTERY_CHARGING_6" file="statusbar_battery6c.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_CHARGING_7" file="statusbar_battery7c.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_CHARGING_8" file="statusbar_battery8c.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_CHARGING_9" file="statusbar_battery9c.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_CHARGING_10" file="statusbar_battery10c.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_CHARGING_11" file="statusbar_battery11c.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_CHARGING_12" file="statusbar_battery12c.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_CHARGING_13" file="statusbar_battery13c.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_CHARGING_14" file="statusbar_battery14c.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_CHARGING_15" file="statusbar_battery15c.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_CHARGING_16" file="statusbar_battery16c.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_1" file="statusbar_battery1d.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_2" file="statusbar_battery2d.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_3" file="statusbar_battery3d.png" type="BINDATA" />
@@ -376,7 +388,15 @@
         <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_6" file="statusbar_battery6d.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_7" file="statusbar_battery7d.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_8" file="statusbar_battery8d.png" type="BINDATA" />
-        <include name="IDR_STATUSBAR_DISCONNECTED" file="statusbar_disconnected.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_9" file="statusbar_battery9d.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_10" file="statusbar_battery10d.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_11" file="statusbar_battery11d.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_12" file="statusbar_battery12d.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_13" file="statusbar_battery13d.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_14" file="statusbar_battery14d.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_15" file="statusbar_battery15d.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_16" file="statusbar_battery16d.png" type="BINDATA" />
+        <include name="IDR_STATUSBAR_NETWORK_DISCONNECTED" file="statusbar_network_disconnected.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_WIFI_1" file="statusbar_wifi_1.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_WIFI_2" file="statusbar_wifi_2.png" type="BINDATA" />
         <include name="IDR_STATUSBAR_WIFI_3" file="statusbar_wifi_3.png" type="BINDATA" />