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

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

8 files changed, 13 insertions, 8 deletions

diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
index 5c3e66d..099f946 100644
--- a/chrome/app/chrome_command_ids.h
+++ b/chrome/app/chrome_command_ids.h
@@ -154,7 +154,7 @@
 #define IDC_DEV_TOOLS                   40003
 #define IDC_DEV_TOOLS_CONSOLE           40004
 #define IDC_TASK_MANAGER                40005
-#define IDC_REPORT_BUG                  40008
+#define IDC_FEEDBACK                    40008
 #define IDC_SHOW_BOOKMARK_BAR           40009
 #define IDC_SHOW_HISTORY                40010
 #define IDC_SHOW_BOOKMARK_MANAGER       40011
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 18fd6acd..bf8bfef 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -918,7 +918,7 @@ each locale. -->
         <message name="IDS_VIEW_SOURCE" desc="The text label of the View Page Source menu item">
           View s&amp;ource
         </message>
-        <message name="IDS_REPORT_BUG" desc="The text label of the Report Bug menu item">
+        <message name="IDS_FEEDBACK" desc="The text label of the Report Bug menu item">
           &amp;Report bug or broken website...
         </message>
         <message name="IDS_DEV_TOOLS" desc="The text label of the Developer Tools menu item">
@@ -944,7 +944,7 @@ each locale. -->
         <message name="IDS_VIEW_SOURCE" desc="In Title Case: The text label of the View Page Source menu item">
           View S&amp;ource
         </message>
-        <message name="IDS_REPORT_BUG" desc="In Title Case: The text label of the Report Bug menu item">
+        <message name="IDS_FEEDBACK" desc="In Title Case: The text label of the Report Bug menu item">
           &amp;Report Bug or Broken Website...
         </message>
         <message name="IDS_DEV_TOOLS" desc="In Title Case: The text label of the Developer Tools menu item">
@@ -4438,6 +4438,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_TOOLTIP_RELOAD" desc="The tooltip for reload button">
         Reload this page
       </message>
+      <message name="IDS_TOOLTIP_FEEDBACK" desc="Tooltip for the feedback button.">
+        Report a bug or an issue
+      </message>
       <message name="IDS_TOOLTIP_STOP" desc="The tooltip for the stop button">
         Stop loading this page
       </message>
@@ -4811,7 +4814,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_BUGREPORT_INCLUDE_NO_SCREENSHOT" desc="Radio button for not including a screen image on the bug report dialog box">
         Do not send a screen shot
       </message>
-      <message name="IDS_BUGREPORT_BUG_TYPE" desc="Label for bug type">
+      <message name="IDS_BUGFEEDBACK_TYPE" desc="Label for bug type">
         Bug type:
       </message>
       <message name="IDS_BUGREPORT_PHISHING_PAGE" desc="Report a bug/problem type: Phishing page">
@@ -8652,7 +8655,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Bring All to Front
         </message>
         <!-- Help menu -->
-        <message name="IDS_REPORT_BUG_MAC" desc="The Mac menu item to report a bug in the Help menu.">
+        <message name="IDS_FEEDBACK_MAC" desc="The Mac menu item to report a bug in the Help menu.">
           Report Bug or Broken Website...
         </message>
         <message name="IDS_HELP_MAC" desc="The Mac menu item to show help in the Help menu.">
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index 0c45c44..217f497 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -1152,7 +1152,7 @@
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="238773614">
 									<reference key="NSMenu" ref="374024848"/>
-									<string key="NSTitle">^IDS_REPORT_BUG_MAC</string>
+									<string key="NSTitle">^IDS_FEEDBACK_MAC</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="353210768"/>
diff --git a/chrome/app/nibs/ReportBug.xib b/chrome/app/nibs/ReportBug.xib
index 2db37a6..c0a0e66 100644
--- a/chrome/app/nibs/ReportBug.xib
+++ b/chrome/app/nibs/ReportBug.xib
@@ -62,7 +62,7 @@
 									<object class="NSTextFieldCell" key="NSCell" id="89599916">
 										<int key="NSCellFlags">68288064</int>
 										<int key="NSCellFlags2">71304192</int>
-										<string key="NSContents">^IDS_BUGREPORT_BUG_TYPE</string>
+										<string key="NSContents">^IDS_BUGFEEDBACK_TYPE</string>
 										<object class="NSFont" key="NSSupport" id="702304060">
 											<string key="NSName">LucidaGrande</string>
 											<double key="NSSize">1.300000e+01</double>
diff --git a/chrome/app/theme/feedback.png b/chrome/app/theme/feedback.png
new file mode 100644
index 0000000..4376f27
--- /dev/null
+++ b/chrome/app/theme/feedback.png
diff --git a/chrome/app/theme/feedback_h.png b/chrome/app/theme/feedback_h.png
new file mode 100644
index 0000000..76b22e0
--- /dev/null
+++ b/chrome/app/theme/feedback_h.png
diff --git a/chrome/app/theme/feedback_p.png b/chrome/app/theme/feedback_p.png
new file mode 100644
index 0000000..9d17cde
--- /dev/null
+++ b/chrome/app/theme/feedback_p.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index dd8672e..4e389c8 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -277,6 +277,9 @@
       <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" />
@@ -539,7 +542,6 @@
         <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" />