summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 23:02:17 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 23:02:17 +0000
commit4c1368436fcfadb3a192c39dcd23a5a01aec50b5 (patch)
tree9fca37da7df7b7ab0e80fd31e0e83459993ffc85 /chrome/app/theme
parente2724e1e0c69bf63d7bc6cd8772423c855d0c973 (diff)
downloadchromium_src-4c1368436fcfadb3a192c39dcd23a5a01aec50b5.zip
chromium_src-4c1368436fcfadb3a192c39dcd23a5a01aec50b5.tar.gz
chromium_src-4c1368436fcfadb3a192c39dcd23a5a01aec50b5.tar.bz2
Revert 65582 - Remove Feedback button from the status bar and add it to the toolbar.
Side effect: Changed all instances of IDC_REPORT_BUG to IDC_FEEDBACK to correctly indicate the message BUG=chromium-os:5361 TEST=Verified visually that the status bar icon is gone and the toolbar icon is there; tested the toolbar icon to verify functionality. Review URL: http://codereview.chromium.org/4546002 TBR=rkc@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
-rw-r--r--chrome/app/theme/feedback.pngbin1800 -> 0 bytes
-rw-r--r--chrome/app/theme/feedback_h.pngbin2216 -> 0 bytes
-rw-r--r--chrome/app/theme/feedback_p.pngbin2252 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd4
4 files changed, 1 insertions, 3 deletions
diff --git a/chrome/app/theme/feedback.png b/chrome/app/theme/feedback.png
deleted file mode 100644
index 4376f27..0000000
--- a/chrome/app/theme/feedback.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/feedback_h.png b/chrome/app/theme/feedback_h.png
deleted file mode 100644
index 76b22e0..0000000
--- a/chrome/app/theme/feedback_h.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/feedback_p.png b/chrome/app/theme/feedback_p.png
deleted file mode 100644
index 9d17cde..0000000
--- a/chrome/app/theme/feedback_p.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 4e389c8..dd8672e 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -277,9 +277,6 @@
<include name="IDR_RELOAD" file="reload.png" type="BINDATA" />
<include name="IDR_RELOAD_H" file="reload_h.png" type="BINDATA" />
<include name="IDR_RELOAD_P" file="reload_p.png" type="BINDATA" />
- <include name="IDR_FEEDBACK" file="feedback.png" type="BINDATA" />
- <include name="IDR_FEEDBACK_H" file="feedback_h.png" type="BINDATA" />
- <include name="IDR_FEEDBACK_P" file="feedback_p.png" type="BINDATA" />
<include name="IDR_RESTORE_BUTTON_MASK" file="restore_button_mask.png" type="BINDATA" />
<include name="IDR_SAD_FAVICON" file="sadfavicon.png" type="BINDATA" />
<include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" />
@@ -542,6 +539,7 @@
<include name="IDR_STATUSBAR_BATTERY_DISCHARGING_9" file="statusbar_battery9d.png" type="BINDATA" />
<include name="IDR_STATUSBAR_BATTERY_MISSING" file="statusbar_battery_missing.png" type="BINDATA" />
<include name="IDR_STATUSBAR_BATTERY_UNKNOWN" file="statusbar_battery_unknown.png" type="BINDATA" />
+ <include name="IDR_STATUSBAR_FEEDBACK" file="statusbar_bug.png" type="BINDATA" />
<include name="IDR_STATUSBAR_MENU" file="statusbar_menu.png" type="BINDATA" />
<include name="IDR_STATUSBAR_NETWORK_3G" file="statusbar_network_3g.png" type="BINDATA" />
<include name="IDR_STATUSBAR_NETWORK_3G_WARN" file="statusbar_network_3g_warn.png" type="BINDATA" />