summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 02:42:45 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-23 02:42:45 +0000
commit2707fe32e964f0c22d87971d305f6e0fb5c3a158 (patch)
treeb9e5c69ceb1ed47d0055f7d9b1cad48e0238689c /chrome/app/theme
parentbfdb3b89730a019b5837689660f565bc60243af2 (diff)
downloadchromium_src-2707fe32e964f0c22d87971d305f6e0fb5c3a158.zip
chromium_src-2707fe32e964f0c22d87971d305f6e0fb5c3a158.tar.gz
chromium_src-2707fe32e964f0c22d87971d305f6e0fb5c3a158.tar.bz2
Make chromeos build use shared object to load battery
functionality. Call into it and show new battery images Review URL: http://codereview.chromium.org/215025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
-rw-r--r--chrome/app/theme/statusbar_battery.pngbin430 -> 0 bytes
-rw-r--r--chrome/app/theme/statusbar_battery1c.pngbin0 -> 329 bytes
-rw-r--r--chrome/app/theme/statusbar_battery1d.pngbin0 -> 310 bytes
-rw-r--r--chrome/app/theme/statusbar_battery2c.pngbin0 -> 336 bytes
-rw-r--r--chrome/app/theme/statusbar_battery2d.pngbin0 -> 314 bytes
-rw-r--r--chrome/app/theme/statusbar_battery3c.pngbin0 -> 340 bytes
-rw-r--r--chrome/app/theme/statusbar_battery3d.pngbin0 -> 319 bytes
-rw-r--r--chrome/app/theme/statusbar_battery4c.pngbin0 -> 337 bytes
-rw-r--r--chrome/app/theme/statusbar_battery4d.pngbin0 -> 300 bytes
-rw-r--r--chrome/app/theme/statusbar_battery5c.pngbin0 -> 340 bytes
-rw-r--r--chrome/app/theme/statusbar_battery5d.pngbin0 -> 298 bytes
-rw-r--r--chrome/app/theme/statusbar_battery6c.pngbin0 -> 343 bytes
-rw-r--r--chrome/app/theme/statusbar_battery6d.pngbin0 -> 295 bytes
-rw-r--r--chrome/app/theme/statusbar_battery7c.pngbin0 -> 339 bytes
-rw-r--r--chrome/app/theme/statusbar_battery7d.pngbin0 -> 294 bytes
-rw-r--r--chrome/app/theme/statusbar_battery8c.pngbin0 -> 315 bytes
-rw-r--r--chrome/app/theme/statusbar_battery8d.pngbin0 -> 270 bytes
-rw-r--r--chrome/app/theme/statusbar_battery_charged.pngbin0 -> 285 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd23
19 files changed, 20 insertions, 3 deletions
diff --git a/chrome/app/theme/statusbar_battery.png b/chrome/app/theme/statusbar_battery.png
deleted file mode 100644
index 595f7c0..0000000
--- a/chrome/app/theme/statusbar_battery.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery1c.png b/chrome/app/theme/statusbar_battery1c.png
new file mode 100644
index 0000000..d812f0b
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery1c.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery1d.png b/chrome/app/theme/statusbar_battery1d.png
new file mode 100644
index 0000000..b28b2b7
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery1d.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery2c.png b/chrome/app/theme/statusbar_battery2c.png
new file mode 100644
index 0000000..a5c1a5b
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery2c.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery2d.png b/chrome/app/theme/statusbar_battery2d.png
new file mode 100644
index 0000000..6256707
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery2d.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery3c.png b/chrome/app/theme/statusbar_battery3c.png
new file mode 100644
index 0000000..42886ed
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery3c.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery3d.png b/chrome/app/theme/statusbar_battery3d.png
new file mode 100644
index 0000000..4657493
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery3d.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery4c.png b/chrome/app/theme/statusbar_battery4c.png
new file mode 100644
index 0000000..1f90b72
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery4c.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery4d.png b/chrome/app/theme/statusbar_battery4d.png
new file mode 100644
index 0000000..d78b44d
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery4d.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery5c.png b/chrome/app/theme/statusbar_battery5c.png
new file mode 100644
index 0000000..5eb5aa8
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery5c.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery5d.png b/chrome/app/theme/statusbar_battery5d.png
new file mode 100644
index 0000000..91b0ae7
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery5d.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery6c.png b/chrome/app/theme/statusbar_battery6c.png
new file mode 100644
index 0000000..922cda8
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery6c.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery6d.png b/chrome/app/theme/statusbar_battery6d.png
new file mode 100644
index 0000000..83e3f1a
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery6d.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery7c.png b/chrome/app/theme/statusbar_battery7c.png
new file mode 100644
index 0000000..23202cd
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery7c.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery7d.png b/chrome/app/theme/statusbar_battery7d.png
new file mode 100644
index 0000000..b778cb9
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery7d.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery8c.png b/chrome/app/theme/statusbar_battery8c.png
new file mode 100644
index 0000000..68649f6
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery8c.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery8d.png b/chrome/app/theme/statusbar_battery8d.png
new file mode 100644
index 0000000..7c9a344
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery8d.png
Binary files differ
diff --git a/chrome/app/theme/statusbar_battery_charged.png b/chrome/app/theme/statusbar_battery_charged.png
new file mode 100644
index 0000000..409825b
--- /dev/null
+++ b/chrome/app/theme/statusbar_battery_charged.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index de12ce5..9a9dc35 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -356,9 +356,26 @@
<include name="IDR_COMPACTNAV_BACK" file="compactnav_back.png" type="BINDATA" />
<include name="IDR_COMPACTNAV_FORWARD" file="compactnav_forward.png" type="BINDATA" />
<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_BATTERY" file="statusbar_battery.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_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" />
+ <include name="IDR_STATUSBAR_BATTERY_CHARGING_4" file="statusbar_battery4c.png" type="BINDATA" />
+ <include name="IDR_STATUSBAR_BATTERY_CHARGING_5" file="statusbar_battery5c.png" type="BINDATA" />
+ <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_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" />
+ <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_4" file="statusbar_battery4d.png" type="BINDATA" />
+ <include name="IDR_STATUSBAR_BATTERY_DISCHARGING_5" file="statusbar_battery5d.png" type="BINDATA" />
+ <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_MAIN_MENU_BUTTON" file="google_chrome/button_menu.png" type="BINDATA" />
<include name="IDR_MAIN_MENU_BUTTON_DROP_DOWN" file="google_chrome/button_menu_drop_down.png" type="BINDATA" />
</if>
@@ -370,7 +387,7 @@
<include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_default_incognito.png" type="BINDATA" />
<include name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_default_inactive.png" type="BINDATA" />
- </if>
+ </if>
</includes>
</release>