diff options
Diffstat (limited to 'chrome')
86 files changed, 134 insertions, 141 deletions
diff --git a/chrome/app/theme/statusbar_battery10c.png b/chrome/app/theme/statusbar_battery10c.png Binary files differindex 5150982..a14ae52 100644 --- a/chrome/app/theme/statusbar_battery10c.png +++ b/chrome/app/theme/statusbar_battery10c.png diff --git a/chrome/app/theme/statusbar_battery10d.png b/chrome/app/theme/statusbar_battery10d.png Binary files differindex 4915275..223e208 100644 --- a/chrome/app/theme/statusbar_battery10d.png +++ b/chrome/app/theme/statusbar_battery10d.png diff --git a/chrome/app/theme/statusbar_battery11c.png b/chrome/app/theme/statusbar_battery11c.png Binary files differindex 7063619..8945da2 100644 --- a/chrome/app/theme/statusbar_battery11c.png +++ b/chrome/app/theme/statusbar_battery11c.png diff --git a/chrome/app/theme/statusbar_battery11d.png b/chrome/app/theme/statusbar_battery11d.png Binary files differindex 8dc2eb3..9d44cc6 100644 --- a/chrome/app/theme/statusbar_battery11d.png +++ b/chrome/app/theme/statusbar_battery11d.png diff --git a/chrome/app/theme/statusbar_battery12c.png b/chrome/app/theme/statusbar_battery12c.png Binary files differindex 85069aa..5816418 100644 --- a/chrome/app/theme/statusbar_battery12c.png +++ b/chrome/app/theme/statusbar_battery12c.png diff --git a/chrome/app/theme/statusbar_battery12d.png b/chrome/app/theme/statusbar_battery12d.png Binary files differindex ce130db..4b86391 100644 --- a/chrome/app/theme/statusbar_battery12d.png +++ b/chrome/app/theme/statusbar_battery12d.png diff --git a/chrome/app/theme/statusbar_battery13c.png b/chrome/app/theme/statusbar_battery13c.png Binary files differdeleted file mode 100644 index 08cc139..0000000 --- a/chrome/app/theme/statusbar_battery13c.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_battery13d.png b/chrome/app/theme/statusbar_battery13d.png Binary files differdeleted file mode 100644 index c63dda7..0000000 --- a/chrome/app/theme/statusbar_battery13d.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_battery14c.png b/chrome/app/theme/statusbar_battery14c.png Binary files differdeleted file mode 100644 index 0874a9e..0000000 --- a/chrome/app/theme/statusbar_battery14c.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_battery14d.png b/chrome/app/theme/statusbar_battery14d.png Binary files differdeleted file mode 100644 index 9620a68..0000000 --- a/chrome/app/theme/statusbar_battery14d.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_battery15c.png b/chrome/app/theme/statusbar_battery15c.png Binary files differdeleted file mode 100644 index 4ab3e48..0000000 --- a/chrome/app/theme/statusbar_battery15c.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_battery15d.png b/chrome/app/theme/statusbar_battery15d.png Binary files differdeleted file mode 100644 index d377e6d..0000000 --- a/chrome/app/theme/statusbar_battery15d.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_battery16c.png b/chrome/app/theme/statusbar_battery16c.png Binary files differdeleted file mode 100644 index ec1c311..0000000 --- a/chrome/app/theme/statusbar_battery16c.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_battery16d.png b/chrome/app/theme/statusbar_battery16d.png Binary files differdeleted file mode 100644 index 345c528..0000000 --- a/chrome/app/theme/statusbar_battery16d.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_battery1c.png b/chrome/app/theme/statusbar_battery1c.png Binary files differindex ed662bf..eeec9fa 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 Binary files differindex 061791c..53a6f39 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 Binary files differindex ac185bc..e02faa0 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 Binary files differindex e0a0695..957dfcd 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 Binary files differindex a03f57e..472c5aa 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 Binary files differindex 5a2dc11..46ea25d 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 Binary files differindex a20ddbb..b13702f 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 Binary files differindex 9cadf16..cb5a788 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 Binary files differindex 01946a5..2c50105 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 Binary files differindex 6ddda93..298e5f5 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 Binary files differindex 93c05d6..b4358b4 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 Binary files differindex 015a270..ca8b130 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 Binary files differindex d9d5c6c..fcd9fb6 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 Binary files differindex ee65b33..90017f9 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 Binary files differindex 529dfbf..de0fc22 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 Binary files differindex 0975111..6c199a4 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 Binary files differindex f0f2972..9fa8e11 100644 --- a/chrome/app/theme/statusbar_battery9c.png +++ b/chrome/app/theme/statusbar_battery9c.png diff --git a/chrome/app/theme/statusbar_battery9d.png b/chrome/app/theme/statusbar_battery9d.png Binary files differindex 5620cd1..950913a 100644 --- a/chrome/app/theme/statusbar_battery9d.png +++ 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 Binary files differindex d052c1b..603eeb9 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 Binary files differindex 4117402..6f2808e 100644 --- a/chrome/app/theme/statusbar_battery_missing.png +++ 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 Binary files differindex 1c68ee6..c33a402 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 Binary files differdeleted file mode 100644 index 5b480d0..0000000 --- a/chrome/app/theme/statusbar_container.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_container_hover.png b/chrome/app/theme/statusbar_container_hover.png Binary files differdeleted file mode 100644 index 210fe5d..0000000 --- a/chrome/app/theme/statusbar_container_hover.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_container_pressed.png b/chrome/app/theme/statusbar_container_pressed.png Binary files differdeleted file mode 100755 index df59803..0000000 --- a/chrome/app/theme/statusbar_container_pressed.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_network_3g.png b/chrome/app/theme/statusbar_network_3g.png Binary files differnew file mode 100644 index 0000000..07e06dd --- /dev/null +++ b/chrome/app/theme/statusbar_network_3g.png diff --git a/chrome/app/theme/statusbar_network_bars0.png b/chrome/app/theme/statusbar_network_bars0.png Binary files differnew file mode 100644 index 0000000..2b64fec --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars0.png diff --git a/chrome/app/theme/statusbar_network_bars0b.png b/chrome/app/theme/statusbar_network_bars0b.png Binary files differnew file mode 100644 index 0000000..9d5440b --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars0b.png diff --git a/chrome/app/theme/statusbar_network_bars1.png b/chrome/app/theme/statusbar_network_bars1.png Binary files differnew file mode 100644 index 0000000..b9eecb1 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars1.png diff --git a/chrome/app/theme/statusbar_network_bars1b.png b/chrome/app/theme/statusbar_network_bars1b.png Binary files differnew file mode 100644 index 0000000..49c254f --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars1b.png diff --git a/chrome/app/theme/statusbar_network_bars2.png b/chrome/app/theme/statusbar_network_bars2.png Binary files differnew file mode 100644 index 0000000..5817545 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars2.png diff --git a/chrome/app/theme/statusbar_network_bars2b.png b/chrome/app/theme/statusbar_network_bars2b.png Binary files differnew file mode 100644 index 0000000..c14b5e8 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars2b.png diff --git a/chrome/app/theme/statusbar_network_bars3.png b/chrome/app/theme/statusbar_network_bars3.png Binary files differnew file mode 100644 index 0000000..b2e8125 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars3.png diff --git a/chrome/app/theme/statusbar_network_bars3b.png b/chrome/app/theme/statusbar_network_bars3b.png Binary files differnew file mode 100644 index 0000000..4e72bc4 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars3b.png diff --git a/chrome/app/theme/statusbar_network_bars4.png b/chrome/app/theme/statusbar_network_bars4.png Binary files differnew file mode 100644 index 0000000..99b5e3b9 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars4.png diff --git a/chrome/app/theme/statusbar_network_bars4b.png b/chrome/app/theme/statusbar_network_bars4b.png Binary files differnew file mode 100644 index 0000000..0e145dd --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars4b.png diff --git a/chrome/app/theme/statusbar_network_bars5.png b/chrome/app/theme/statusbar_network_bars5.png Binary files differnew file mode 100644 index 0000000..23da50e --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars5.png diff --git a/chrome/app/theme/statusbar_network_bars5b.png b/chrome/app/theme/statusbar_network_bars5b.png Binary files differnew file mode 100644 index 0000000..b84e161 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars5b.png diff --git a/chrome/app/theme/statusbar_network_bars6.png b/chrome/app/theme/statusbar_network_bars6.png Binary files differnew file mode 100644 index 0000000..2344237 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars6.png diff --git a/chrome/app/theme/statusbar_network_bars6b.png b/chrome/app/theme/statusbar_network_bars6b.png Binary files differnew file mode 100644 index 0000000..e2cdf78 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars6b.png diff --git a/chrome/app/theme/statusbar_network_bars7.png b/chrome/app/theme/statusbar_network_bars7.png Binary files differnew file mode 100644 index 0000000..aef27ae --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars7.png diff --git a/chrome/app/theme/statusbar_network_bars7b.png b/chrome/app/theme/statusbar_network_bars7b.png Binary files differnew file mode 100644 index 0000000..2e9e064 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars7b.png diff --git a/chrome/app/theme/statusbar_network_bars8.png b/chrome/app/theme/statusbar_network_bars8.png Binary files differnew file mode 100644 index 0000000..eb12fc4 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars8.png diff --git a/chrome/app/theme/statusbar_network_bars8b.png b/chrome/app/theme/statusbar_network_bars8b.png Binary files differnew file mode 100644 index 0000000..cce6a45 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars8b.png diff --git a/chrome/app/theme/statusbar_network_bars9.png b/chrome/app/theme/statusbar_network_bars9.png Binary files differnew file mode 100644 index 0000000..7c19a3f --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars9.png diff --git a/chrome/app/theme/statusbar_network_bars9b.png b/chrome/app/theme/statusbar_network_bars9b.png Binary files differnew file mode 100644 index 0000000..412d649 --- /dev/null +++ b/chrome/app/theme/statusbar_network_bars9b.png diff --git a/chrome/app/theme/statusbar_network_disconnected.png b/chrome/app/theme/statusbar_network_disconnected.png Binary files differindex 4ca63e3..faefeb9 100644 --- a/chrome/app/theme/statusbar_network_disconnected.png +++ b/chrome/app/theme/statusbar_network_disconnected.png diff --git a/chrome/app/theme/statusbar_network_edge.png b/chrome/app/theme/statusbar_network_edge.png Binary files differnew file mode 100644 index 0000000..5a6deff --- /dev/null +++ b/chrome/app/theme/statusbar_network_edge.png diff --git a/chrome/app/theme/statusbar_network_warning.png b/chrome/app/theme/statusbar_network_warning.png Binary files differnew file mode 100644 index 0000000..851a504 --- /dev/null +++ b/chrome/app/theme/statusbar_network_warning.png diff --git a/chrome/app/theme/statusbar_pressed.png b/chrome/app/theme/statusbar_pressed.png Binary files differnew file mode 100644 index 0000000..7da4caa --- /dev/null +++ b/chrome/app/theme/statusbar_pressed.png diff --git a/chrome/app/theme/statusbar_wifi_dot.png b/chrome/app/theme/statusbar_wifi_dot.png Binary files differdeleted file mode 100644 index 76d6186..0000000 --- a/chrome/app/theme/statusbar_wifi_dot.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_down1.png b/chrome/app/theme/statusbar_wifi_down1.png Binary files differdeleted file mode 100644 index ab31a97..0000000 --- a/chrome/app/theme/statusbar_wifi_down1.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_down1p.png b/chrome/app/theme/statusbar_wifi_down1p.png Binary files differdeleted file mode 100644 index f961eb1..0000000 --- a/chrome/app/theme/statusbar_wifi_down1p.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_down2.png b/chrome/app/theme/statusbar_wifi_down2.png Binary files differdeleted file mode 100644 index 8ad080c..0000000 --- a/chrome/app/theme/statusbar_wifi_down2.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_down2p.png b/chrome/app/theme/statusbar_wifi_down2p.png Binary files differdeleted file mode 100644 index 862fd52..0000000 --- a/chrome/app/theme/statusbar_wifi_down2p.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_down3.png b/chrome/app/theme/statusbar_wifi_down3.png Binary files differdeleted file mode 100644 index 4c9eb46..0000000 --- a/chrome/app/theme/statusbar_wifi_down3.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_down3p.png b/chrome/app/theme/statusbar_wifi_down3p.png Binary files differdeleted file mode 100644 index 959a797..0000000 --- a/chrome/app/theme/statusbar_wifi_down3p.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_up1.png b/chrome/app/theme/statusbar_wifi_up1.png Binary files differdeleted file mode 100644 index 2e80214..0000000 --- a/chrome/app/theme/statusbar_wifi_up1.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_up1p.png b/chrome/app/theme/statusbar_wifi_up1p.png Binary files differdeleted file mode 100644 index b86496c..0000000 --- a/chrome/app/theme/statusbar_wifi_up1p.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_up2.png b/chrome/app/theme/statusbar_wifi_up2.png Binary files differdeleted file mode 100644 index db21721..0000000 --- a/chrome/app/theme/statusbar_wifi_up2.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_up2p.png b/chrome/app/theme/statusbar_wifi_up2p.png Binary files differdeleted file mode 100644 index 15bacc1..0000000 --- a/chrome/app/theme/statusbar_wifi_up2p.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_up3.png b/chrome/app/theme/statusbar_wifi_up3.png Binary files differdeleted file mode 100644 index 5789483..0000000 --- a/chrome/app/theme/statusbar_wifi_up3.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_up3p.png b/chrome/app/theme/statusbar_wifi_up3p.png Binary files differdeleted file mode 100644 index 871d0e9..0000000 --- a/chrome/app/theme/statusbar_wifi_up3p.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wifi_warning.png b/chrome/app/theme/statusbar_wifi_warning.png Binary files differdeleted file mode 100644 index d033ec2..0000000 --- a/chrome/app/theme/statusbar_wifi_warning.png +++ /dev/null diff --git a/chrome/app/theme/statusbar_wired.png b/chrome/app/theme/statusbar_wired.png Binary files differindex c7e03de..60aecb8 100644 --- a/chrome/app/theme/statusbar_wired.png +++ b/chrome/app/theme/statusbar_wired.png diff --git a/chrome/app/theme/statusbar_wiredb.png b/chrome/app/theme/statusbar_wiredb.png Binary files differnew file mode 100644 index 0000000..f625cda --- /dev/null +++ b/chrome/app/theme/statusbar_wiredb.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 64f075e..3a5cb853 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -368,9 +368,7 @@ <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_PRESSED" file="statusbar_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" /> @@ -386,10 +384,6 @@ <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" /> @@ -402,26 +396,32 @@ <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_BARS0" file="statusbar_network_bars0.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS1" file="statusbar_network_bars1.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS2" file="statusbar_network_bars2.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS3" file="statusbar_network_bars3.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS4" file="statusbar_network_bars4.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS5" file="statusbar_network_bars5.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS6" file="statusbar_network_bars6.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS7" file="statusbar_network_bars7.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS8" file="statusbar_network_bars8.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS9" file="statusbar_network_bars9.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS0_BLACK" file="statusbar_network_bars0b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS1_BLACK" file="statusbar_network_bars1b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS2_BLACK" file="statusbar_network_bars2b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS3_BLACK" file="statusbar_network_bars3b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS4_BLACK" file="statusbar_network_bars4b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS5_BLACK" file="statusbar_network_bars5b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS6_BLACK" file="statusbar_network_bars6b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS7_BLACK" file="statusbar_network_bars7b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS8_BLACK" file="statusbar_network_bars8b.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_BARS9_BLACK" file="statusbar_network_bars9b.png" type="BINDATA" /> <include name="IDR_STATUSBAR_NETWORK_DISCONNECTED" file="statusbar_network_disconnected.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_DOT" file="statusbar_wifi_dot.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_DOWN1" file="statusbar_wifi_down1.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_DOWN2" file="statusbar_wifi_down2.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_DOWN3" file="statusbar_wifi_down3.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_DOWN1P" file="statusbar_wifi_down1p.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_DOWN2P" file="statusbar_wifi_down2p.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_DOWN3P" file="statusbar_wifi_down3p.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_UP1" file="statusbar_wifi_up1.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_UP2" file="statusbar_wifi_up2.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_UP3" file="statusbar_wifi_up3.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_UP1P" file="statusbar_wifi_up1p.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_UP2P" file="statusbar_wifi_up2p.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WIFI_UP3P" file="statusbar_wifi_up3p.png" type="BINDATA" /> - <include name="IDR_STATUSBAR_WARNING" file="statusbar_wifi_warning.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_WARNING" file="statusbar_network_warning.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_EDGE" file="statusbar_network_edge.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_NETWORK_3G" file="statusbar_network_3g.png" type="BINDATA" /> <include name="IDR_STATUSBAR_WIRED" file="statusbar_wired.png" type="BINDATA" /> + <include name="IDR_STATUSBAR_WIRED_BLACK" file="statusbar_wiredb.png" type="BINDATA" /> <include name="IDR_FILEBROWSER_BACK" file="filebrowse_back.png" type="BINDATA" /> <include name="IDR_FILEBROWSER_FWD" file="filebrowse_forward.png" type="BINDATA" /> <include name="IDR_ICON_APP" file="icon_app.png" type="BINDATA" /> diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc index 4cbb37c..dbeb0f6 100644 --- a/chrome/browser/chromeos/status/network_menu_button.cc +++ b/chrome/browser/chromeos/status/network_menu_button.cc @@ -22,48 +22,16 @@ namespace chromeos { // NetworkMenuButton // static -const int NetworkMenuButton::kNumWifiImages = 3; -const int NetworkMenuButton::kMinOpacity = 50; -const int NetworkMenuButton::kMaxOpacity = 256; +const int NetworkMenuButton::kNumWifiImages = 9; const int NetworkMenuButton::kThrobDuration = 1000; -SkBitmap* NetworkMenuButton::menu_wifi_icons_ = NULL; -SkBitmap* NetworkMenuButton::menu_wired_icon_ = NULL; -SkBitmap* NetworkMenuButton::menu_disconnected_icon_ = NULL; NetworkMenuButton::NetworkMenuButton(gfx::NativeWindow parent_window) : StatusAreaButton(this), ALLOW_THIS_IN_INITIALIZER_LIST(network_menu_(this)), parent_window_(parent_window), - ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(animation_downloading_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(animation_uploading_(this)) { - // Initialize the static menu icons. - static bool initialized = false; - if (!initialized) { - ResourceBundle& rb = ResourceBundle::GetSharedInstance(); - menu_wired_icon_ = new SkBitmap(SkBitmapOperations::CreateInvertedBitmap( - *rb.GetBitmapNamed(IDR_STATUSBAR_WIRED))); - menu_disconnected_icon_ = new SkBitmap( - SkBitmapOperations::CreateInvertedBitmap( - *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED))); - menu_wifi_icons_ = new SkBitmap[kNumWifiImages + 1]; - SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_WIFI_DOT); - menu_wifi_icons_[0] = SkBitmapOperations::CreateInvertedBitmap(icon); - for (int i = 0; i < kNumWifiImages; i++) { - icon = SkBitmapOperations::CreateSuperimposedBitmap(icon, - *rb.GetBitmapNamed(IDR_STATUSBAR_WIFI_UP1 + i)); - icon = SkBitmapOperations::CreateSuperimposedBitmap(icon, - *rb.GetBitmapNamed(IDR_STATUSBAR_WIFI_DOWN1 + i)); - menu_wifi_icons_[i + 1] = SkBitmapOperations::CreateInvertedBitmap(icon); - } - initialized = true; - } + ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)) { animation_connecting_.SetThrobDuration(kThrobDuration); animation_connecting_.SetTweenType(SlideAnimation::NONE); - animation_downloading_.SetThrobDuration(kThrobDuration); - animation_downloading_.SetTweenType(SlideAnimation::NONE); - animation_uploading_.SetThrobDuration(kThrobDuration); - animation_uploading_.SetTweenType(SlideAnimation::NONE); NetworkChanged(NetworkLibrary::Get()); NetworkLibrary::Get()->AddObserver(this); } @@ -163,22 +131,59 @@ bool NetworkMenuButton::OnPasswordDialogAccept(const std::string& ssid, // NetworkMenuButton, AnimationDelegate implementation: void NetworkMenuButton::AnimationProgressed(const Animation* animation) { - if (animation == &animation_connecting_ || - animation == &animation_downloading_ || - animation == &animation_uploading_) + if (animation == &animation_connecting_) { + // Figure out which image to draw. We want a value between 0-100. + // 0 reperesents no signal and 100 represents full signal strength. + int value = static_cast<int>(animation_connecting_.GetCurrentValue()*100.0); + if (value < 0) + value = 0; + else if (value > 100) + value = 100; + SetIcon(IconForNetworkStrength(value, false)); SchedulePaint(); - else + } else { MenuButton::AnimationProgressed(animation); + } } //////////////////////////////////////////////////////////////////////////////// // NetworkMenuButton, StatusAreaButton implementation: +void NetworkMenuButton::DrawIcon(gfx::Canvas* canvas) { + // Draw the network icon 4 pixels down to center it. + // Because the status icon is 24x24 but the images are 24x16. + static const int kIconVerticalPadding = 4; + canvas->DrawBitmapInt(icon(), 0, kIconVerticalPadding); + + // Draw badge at (14,14) if there is one. + static const int x = 14; + static const int y = 14; + NetworkLibrary* cros = NetworkLibrary::Get(); + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + if (cros->EnsureLoaded()) { + if (!cros->Connected()) { + canvas->DrawBitmapInt( + *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED), x, y); + } else if (cros->cellular_connecting() || cros->cellular_connected()) { + // TODO(chocobo): Check cellular network 3g/edge. + canvas->DrawBitmapInt( + *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_3G), x, y); +// canvas->DrawBitmapInt( +// *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_EDGE), x, y); + } + } else { + canvas->DrawBitmapInt( + *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_WARNING), x, y); + } +} + // Override the DrawIcon method to draw the wifi icon. // The wifi icon is composed of 1 or more alpha-blended icons to show the // network strength. We also draw an animation for when there's upload/download // traffic. +/* TODO(chocobo): Add this code back in when UI is finalized. void NetworkMenuButton::DrawIcon(gfx::Canvas* canvas) { + // First draw the base icon. canvas->DrawBitmapInt(icon(), 0, 0); @@ -261,43 +266,43 @@ void NetworkMenuButton::DrawIcon(gfx::Canvas* canvas) { } } } - +*/ //////////////////////////////////////////////////////////////////////////////// // NetworkMenuButton, NetworkLibrary::Observer implementation: void NetworkMenuButton::NetworkChanged(NetworkLibrary* cros) { - int id = IDR_STATUSBAR_WARNING; + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); if (cros->EnsureLoaded()) { - id = IDR_STATUSBAR_NETWORK_DISCONNECTED; - if (cros->wifi_connecting()) { + if (cros->wifi_connecting() || cros->cellular_connecting()) { // Start the connecting animation if not running. if (!animation_connecting_.IsAnimating()) { animation_connecting_.Reset(); animation_connecting_.StartThrobbing(std::numeric_limits<int>::max()); + SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS1)); } - // Stop network traffic animation when we are connecting. - animation_downloading_.Stop(); - animation_uploading_.Stop(); - - id = IDR_STATUSBAR_WIFI_DOT; } else { // Stop connecting animation since we are not connecting. animation_connecting_.Stop(); // Always show the higher priority connection first. Ethernet then wifi. - if (cros->ethernet_connected()) { - id = IDR_STATUSBAR_WIRED; - } else if (cros->wifi_connected()) { - id = IDR_STATUSBAR_WIFI_DOT; - } + if (cros->ethernet_connected()) + SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED)); + else if (cros->wifi_connected()) + SetIcon(IconForNetworkStrength(cros->wifi_strength(), false)); + else if (cros->cellular_connected()) + SetIcon(IconForNetworkStrength(cros->cellular_strength(), false)); + else + SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0)); } + } else { + SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0)); } - SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(id)); SchedulePaint(); } void NetworkMenuButton::NetworkTraffic(NetworkLibrary* cros, int traffic_type) { +/* TODO(chocobo): Add this code back in when network traffic UI is finalized. if (!cros->ethernet_connected() && cros->wifi_connected() && !cros->wifi_connecting()) { // For downloading/uploading animation, we want to force at least one cycle @@ -308,24 +313,21 @@ void NetworkMenuButton::NetworkTraffic(NetworkLibrary* cros, int traffic_type) { if (traffic_type & TRAFFIC_UPLOAD) animation_uploading_.StartThrobbing(2); } + */ } // static -SkBitmap NetworkMenuButton::IconForWifiStrength(int strength) { +SkBitmap NetworkMenuButton::IconForNetworkStrength(int strength, bool black) { // Compose wifi icon by superimposing various icons. int index = static_cast<int>(strength / 100.0 * - nextafter(static_cast<float>(kNumWifiImages + 1), 0)); + nextafter(static_cast<float>(kNumWifiImages), 0)); if (index < 0) index = 0; - if (index > kNumWifiImages) - index = kNumWifiImages; - return menu_wifi_icons_[index]; -} - -// static -SkBitmap NetworkMenuButton::IconForCellularStrength(int strength) { - // TODO(chocobo): need to switch to cellular icons when they are ready. - return IconForWifiStrength(strength); + if (index >= kNumWifiImages) + index = kNumWifiImages - 1; + int base = black ? IDR_STATUSBAR_NETWORK_BARS1_BLACK : + IDR_STATUSBAR_NETWORK_BARS1; + return *ResourceBundle::GetSharedInstance().GetBitmapNamed(base + index); } //////////////////////////////////////////////////////////////////////////////// @@ -344,9 +346,7 @@ void NetworkMenuButton::InitMenuItems() { menu_items_.clear(); // Populate our MenuItems with the current list of wifi networks. NetworkLibrary* cros = NetworkLibrary::Get(); - // If cros is not loaded, then have an empty menu. - if (!cros->EnsureLoaded()) - return; + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); bool offline_mode = cros->offline_mode(); @@ -363,8 +363,8 @@ void NetworkMenuButton::InitMenuItems() { l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_WIFI), l10n_util::GetStringUTF16(status)); SkBitmap icon = cros->wifi_connected() ? - IconForWifiStrength(cros->wifi_strength()) : - *menu_disconnected_icon_; + IconForNetworkStrength(cros->wifi_strength(), true) : + *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED); menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label, icon, WifiNetwork(), CellularNetwork(), FLAG_DISABLED)); @@ -419,8 +419,8 @@ void NetworkMenuButton::InitMenuItems() { l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_CELLULAR), l10n_util::GetStringUTF16(status)); icon = cros->cellular_connected() ? - IconForCellularStrength(cros->cellular_strength()) : - *menu_disconnected_icon_; + IconForNetworkStrength(cros->cellular_strength(), true) : + *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED); menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label, icon, WifiNetwork(), CellularNetwork(), FLAG_DISABLED)); @@ -473,8 +473,9 @@ void NetworkMenuButton::InitMenuItems() { label = l10n_util::GetStringFUTF16(IDS_STATUSBAR_NETWORK_DEVICE_STATUS, l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET), l10n_util::GetStringUTF16(status)); - icon = cros->ethernet_connected() ? *menu_wired_icon_ : - *menu_disconnected_icon_; + icon = cros->ethernet_connected() ? + *rb.GetBitmapNamed(IDR_STATUSBAR_WIRED_BLACK) : + *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED); menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label, icon, WifiNetwork(), CellularNetwork(), FLAG_DISABLED)); diff --git a/chrome/browser/chromeos/status/network_menu_button.h b/chrome/browser/chromeos/status/network_menu_button.h index 1ae4c80..1ebd3db4 100644 --- a/chrome/browser/chromeos/status/network_menu_button.h +++ b/chrome/browser/chromeos/status/network_menu_button.h @@ -128,9 +128,10 @@ class NetworkMenuButton : public StatusAreaButton, }; typedef std::vector<MenuItem> MenuItemVector; - static SkBitmap IconForWifiStrength(int strength); - - static SkBitmap IconForCellularStrength(int strength); + // Returns the Icon for a network strength between 0 and 100. + // |black| is used to specify whether to return a black icon for display + // on a light background or a white icon for display on a dark background. + static SkBitmap IconForNetworkStrength(int strength, bool black); // views::ViewMenuDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt); @@ -144,21 +145,6 @@ class NetworkMenuButton : public StatusAreaButton, // The number of wifi strength images. static const int kNumWifiImages; - // The minimum opacity of the wifi bars. - static const int kMinOpacity; - - // The maximum opacity of the wifi bars. - static const int kMaxOpacity; - - // The wifi icons used in menu. These are built on initialization. - static SkBitmap* menu_wifi_icons_; - - // The ethernet icon used in menu, - static SkBitmap* menu_wired_icon_; - - // The disconnected icon used in menu, - static SkBitmap* menu_disconnected_icon_; - // Our menu items. MenuItemVector menu_items_; @@ -174,12 +160,6 @@ class NetworkMenuButton : public StatusAreaButton, // The throb animation that does the wifi connecting animation. ThrobAnimation animation_connecting_; - // The throb animation that does the downloading animation. - ThrobAnimation animation_downloading_; - - // The throb animation that does the uploading animation. - ThrobAnimation animation_uploading_; - // The duration of the icon throbbing in milliseconds. static const int kThrobDuration; diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc index de3eddb..b0345ee 100644 --- a/chrome/browser/chromeos/status/power_menu_button.cc +++ b/chrome/browser/chromeos/status/power_menu_button.cc @@ -4,6 +4,7 @@ #include "chrome/browser/chromeos/status/power_menu_button.h" +#include "app/gfx/canvas.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/time.h" @@ -16,7 +17,7 @@ namespace chromeos { // PowerMenuButton // static -const int PowerMenuButton::kNumPowerImages = 16; +const int PowerMenuButton::kNumPowerImages = 12; PowerMenuButton::PowerMenuButton() : StatusAreaButton(this), @@ -99,6 +100,17 @@ void PowerMenuButton::PowerChanged(PowerLibrary* obj) { UpdateIcon(); } +//////////////////////////////////////////////////////////////////////////////// +// PowerMenuButton, StatusAreaButton implementation: + +void PowerMenuButton::DrawIcon(gfx::Canvas* canvas) { + // Draw the battery icon 6 pixels down to center it. + // Because the status icon is 24x24 but the images are 24x16. + // But since the images are shifted up by 4 pixels, we draw at 6 pixels down. + static const int kIconVerticalPadding = 6; + canvas->DrawBitmapInt(icon(), 0, kIconVerticalPadding); +} + void PowerMenuButton::UpdateIcon() { PowerLibrary* cros = PowerLibrary::Get(); int id = IDR_STATUSBAR_BATTERY_UNKNOWN; diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h index 5ac9e0b..1828f1f 100644 --- a/chrome/browser/chromeos/status/power_menu_button.h +++ b/chrome/browser/chromeos/status/power_menu_button.h @@ -46,6 +46,10 @@ class PowerMenuButton : public StatusAreaButton, // PowerLibrary::Observer implementation. virtual void PowerChanged(PowerLibrary* obj); + protected: + // StatusAreaButton implementation. + virtual void DrawIcon(gfx::Canvas* canvas); + private: // views::ViewMenuDelegate implementation. virtual void RunMenu(views::View* source, const gfx::Point& pt); diff --git a/chrome/browser/chromeos/status/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc index 9a4a0f3..d779eea 100644 --- a/chrome/browser/chromeos/status/status_area_button.cc +++ b/chrome/browser/chromeos/status/status_area_button.cc @@ -23,28 +23,23 @@ StatusAreaButton::StatusAreaButton(views::ViewMenuDelegate* menu_delegate) } void StatusAreaButton::Paint(gfx::Canvas* canvas, bool for_drag) { - int bitmap_id; - - switch (state()) { - case BS_NORMAL: - bitmap_id = IDR_STATUSBAR_CONTAINER; - break; - case BS_HOT: - bitmap_id = IDR_STATUSBAR_CONTAINER_HOVER; - break; - case BS_PUSHED: - bitmap_id = IDR_STATUSBAR_CONTAINER_PRESSED; - break; - default: - bitmap_id = IDR_STATUSBAR_CONTAINER; - NOTREACHED(); + if (state() == BS_PUSHED) { + canvas->DrawBitmapInt(*ResourceBundle::GetSharedInstance(). + GetBitmapNamed(IDR_STATUSBAR_PRESSED), 0, 0); } - SkBitmap* container = - ResourceBundle::GetSharedInstance().GetBitmapNamed(bitmap_id); - canvas->DrawBitmapInt(*container, 0, 0); DrawIcon(canvas); } +gfx::Size StatusAreaButton::GetPreferredSize() { + // icons are 24x24 + static const int kIconWidth = 24; + static const int kIconHeight = 24; + gfx::Insets insets = GetInsets(); + gfx::Size prefsize(kIconWidth + insets.width(), + kIconHeight + insets.height()); + return prefsize; +} + void StatusAreaButton::DrawIcon(gfx::Canvas* canvas) { canvas->DrawBitmapInt(icon(), 0, 0); } diff --git a/chrome/browser/chromeos/status/status_area_button.h b/chrome/browser/chromeos/status/status_area_button.h index 308f601..cb7728d 100644 --- a/chrome/browser/chromeos/status/status_area_button.h +++ b/chrome/browser/chromeos/status/status_area_button.h @@ -17,6 +17,7 @@ class StatusAreaButton : public views::MenuButton { explicit StatusAreaButton(views::ViewMenuDelegate* menu_delegate); virtual ~StatusAreaButton() {} virtual void Paint(gfx::Canvas* canvas, bool for_drag); + virtual gfx::Size GetPreferredSize(); protected: // Draws the icon for this status area button on the canvas. |
