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.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=65582

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

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

21 files changed, 65 insertions, 135 deletions

diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
index f35fef1..cc78218 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 1c70545..c3c91a9 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">
@@ -4463,6 +4463,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>
@@ -4836,7 +4839,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">
@@ -8716,7 +8719,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 ad925e3..4a3cc1f 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 26df377..52f66b7 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -280,6 +280,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" />
@@ -542,7 +545,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" />
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 9a5052e..f0c715b 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -888,7 +888,7 @@ void RecordLastRunAppBundlePath() {
       else
         Browser::OpenHelpWindow(defaultProfile);
       break;
-    case IDC_REPORT_BUG: {
+    case IDC_FEEDBACK: {
       Browser* browser = BrowserList::GetLastActive();
       TabContents* currentTab =
           browser ? browser->GetSelectedTabContents() : NULL;
@@ -1000,7 +1000,7 @@ void RecordLastRunAppBundlePath() {
   menuState_->UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS, true);
   menuState_->UpdateCommandEnabled(IDC_HELP_PAGE, true);
   menuState_->UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true);
-  menuState_->UpdateCommandEnabled(IDC_REPORT_BUG, true);
+  menuState_->UpdateCommandEnabled(IDC_FEEDBACK, true);
   menuState_->UpdateCommandEnabled(IDC_SYNC_BOOKMARKS, true);
   menuState_->UpdateCommandEnabled(IDC_TASK_MANAGER, true);
 }
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index dfbd71b..1f228b3 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/login/shutdown_button.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
-#include "chrome/browser/chromeos/status/feedback_menu_button.h"
 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
@@ -298,7 +297,6 @@ bool BackgroundView::ShouldOpenButtonOptions(
     return true;
   }
   if (button_view == status_area_->clock_view() ||
-      button_view == status_area_->feedback_view() ||
       button_view == status_area_->input_method_view()) {
     return false;
   }
@@ -336,8 +334,6 @@ void BackgroundView::InitStatusArea() {
   DCHECK(status_area_ == NULL);
   status_area_ = new StatusAreaView(this);
   status_area_->Init();
-  // Feedback button shoudn't be visible on OOBE/login/screen lock.
-  status_area_->feedback_view()->SetVisible(false);
   AddChildView(status_area_);
 }
 
diff --git a/chrome/browser/chromeos/status/feedback_menu_button.cc b/chrome/browser/chromeos/status/feedback_menu_button.cc
deleted file mode 100644
index 2a0ea52..0000000
--- a/chrome/browser/chromeos/status/feedback_menu_button.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/status/feedback_menu_button.h"
-
-#include <string>
-
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
-#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/chromeos/status/status_area_host.h"
-#include "gfx/canvas.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
-
-namespace chromeos {
-
-////////////////////////////////////////////////////////////////////////////////
-// FeedbackMenuButton
-
-FeedbackMenuButton::FeedbackMenuButton(StatusAreaHost* host)
-    : StatusAreaButton(this),
-      host_(host) {
-  DCHECK(host_);
-  SetTooltipText(l10n_util::GetString(IDS_STATUSBAR_FEEDBACK_TOOLTIP));
-  SetIcon(*ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_STATUSBAR_FEEDBACK));
-}
-
-FeedbackMenuButton::~FeedbackMenuButton() {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// PowerMenuButton, views::ViewMenuDelegate implementation:
-
-void FeedbackMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
-  DCHECK(host_);
-  host_->ExecuteBrowserCommand(IDC_REPORT_BUG);
-}
-
-}  // namespace chromeos
diff --git a/chrome/browser/chromeos/status/feedback_menu_button.h b/chrome/browser/chromeos/status/feedback_menu_button.h
deleted file mode 100644
index 3e7d83c..0000000
--- a/chrome/browser/chromeos/status/feedback_menu_button.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_CHROMEOS_STATUS_FEEDBACK_MENU_BUTTON_H_
-#define CHROME_BROWSER_CHROMEOS_STATUS_FEEDBACK_MENU_BUTTON_H_
-#pragma once
-
-#include "chrome/browser/chromeos/status/status_area_button.h"
-#include "views/controls/menu/menu_2.h"
-#include "views/controls/menu/view_menu_delegate.h"
-
-class SkBitmap;
-
-namespace chromeos {
-
-class StatusAreaHost;
-
-// The language menu button in the status area.
-// This class will handle getting the IME/XKB status and populating the menu.
-class FeedbackMenuButton : public StatusAreaButton,
-                           public views::ViewMenuDelegate,
-                           public menus::MenuModel {
- public:
-  explicit FeedbackMenuButton(StatusAreaHost* host);
-  virtual ~FeedbackMenuButton();
-
- private:
-  // views::ViewMenuDelegate implementation.
-  virtual void RunMenu(views::View* source, const gfx::Point& pt);
-
-  // menus::MenuModel implementation.
-  virtual int GetItemCount() const { return 0; }
-  virtual bool HasIcons() const  { return false; }
-  virtual menus::MenuModel::ItemType GetTypeAt(int index) const {
-    return menus::MenuModel::TYPE_COMMAND;
-  }
-  virtual int GetCommandIdAt(int index) const { return index; }
-  virtual string16 GetLabelAt(int index) const { return string16(); }
-  virtual bool IsLabelDynamicAt(int index) const { return true; }
-  virtual bool GetAcceleratorAt(int index,
-      menus::Accelerator* accelerator) const { return false; }
-  virtual bool IsItemCheckedAt(int index) const { return false; }
-  virtual int GetGroupIdAt(int index) const { return 0; }
-  virtual bool GetIconAt(int index, SkBitmap* icon) const { return false; }
-  virtual menus::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const {
-    return NULL;
-  }
-  virtual bool IsEnabledAt(int index) const { return false; }
-  virtual menus::MenuModel* GetSubmenuModelAt(int index) const { return NULL; }
-  virtual void HighlightChangedTo(int index) {}
-  virtual void ActivatedAt(int index) {}
-  virtual void MenuWillShow() {}
-
-  StatusAreaHost* host_;
-
-  DISALLOW_COPY_AND_ASSIGN(FeedbackMenuButton);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_STATUS_FEEDBACK_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc
index 5adbcab..86bd3c4 100644
--- a/chrome/browser/chromeos/status/status_area_view.cc
+++ b/chrome/browser/chromeos/status/status_area_view.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
-#include "chrome/browser/chromeos/status/feedback_menu_button.h"
 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/power_menu_button.h"
@@ -22,7 +21,6 @@ const int kSeparation = 1;
 StatusAreaView::StatusAreaView(StatusAreaHost* host)
     : host_(host),
       clock_view_(NULL),
-      feedback_view_(NULL),
       input_method_view_(NULL),
       network_view_(NULL),
       power_view_(NULL) {
@@ -37,10 +35,6 @@ void StatusAreaView::Init() {
   input_method_view_ = new InputMethodMenuButton(host_);
   AddChildView(input_method_view_);
 
-  // Feedback.
-  feedback_view_ = new FeedbackMenuButton(host_);
-  AddChildView(feedback_view_);
-
   // Network.
   network_view_ = new NetworkMenuButton(host_);
   AddChildView(network_view_);
@@ -96,7 +90,6 @@ void StatusAreaView::ChildPreferredSizeChanged(View* child) {
 
 void StatusAreaView::EnableButtons(bool enable) {
   clock_view()->Enable(enable);
-  feedback_view()->Enable(enable);
   input_method_view()->Enable(enable);
   network_view()->Enable(enable);
   power_view()->Enable(enable);
diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h
index 7e76bc5..bf852e9 100644
--- a/chrome/browser/chromeos/status/status_area_view.h
+++ b/chrome/browser/chromeos/status/status_area_view.h
@@ -13,7 +13,6 @@
 namespace chromeos {
 
 class ClockMenuButton;
-class FeedbackMenuButton;
 class InputMethodMenuButton;
 class NetworkMenuButton;
 class PowerMenuButton;
@@ -35,7 +34,6 @@ class StatusAreaView : public AccessiblePaneView {
   virtual void ChildPreferredSizeChanged(View* child);
 
   ClockMenuButton* clock_view() { return clock_view_; }
-  FeedbackMenuButton* feedback_view() { return feedback_view_; }
   InputMethodMenuButton* input_method_view() { return input_method_view_; }
   NetworkMenuButton* network_view() { return network_view_; }
   PowerMenuButton* power_view() { return power_view_; }
@@ -44,7 +42,6 @@ class StatusAreaView : public AccessiblePaneView {
   StatusAreaHost* host_;
 
   ClockMenuButton* clock_view_;
-  FeedbackMenuButton* feedback_view_;
   InputMethodMenuButton* input_method_view_;
   NetworkMenuButton* network_view_;
   PowerMenuButton* power_view_;
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index c21f7eb..6d22367 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1097,7 +1097,7 @@ void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
 
   // Show various bits of UI
   command_updater_.UpdateCommandEnabled(IDC_DEVELOPER_MENU, show_main_ui);
-  command_updater_.UpdateCommandEnabled(IDC_REPORT_BUG, show_main_ui);
+  command_updater_.UpdateCommandEnabled(IDC_FEEDBACK, show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR,
       browser_defaults::bookmarks_enabled && show_main_ui);
   command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, show_main_ui);
@@ -2213,7 +2213,7 @@ void Browser::ExecuteCommandWithDisposition(
                                     break;
     case IDC_TASK_MANAGER:          // fall through to OpenTaskManager().
     case IDC_VIEW_BACKGROUND_PAGES: OpenTaskManager();                break;
-    case IDC_REPORT_BUG:            OpenBugReportDialog();            break;
+    case IDC_FEEDBACK:              OpenBugReportDialog();            break;
 
     case IDC_SHOW_BOOKMARK_BAR:     ToggleBookmarkBar();              break;
 
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 3b3b052..76e08b5 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -80,6 +80,9 @@ ToolbarView::ToolbarView(Browser* browser)
       back_(NULL),
       forward_(NULL),
       reload_(NULL),
+#if defined(OS_CHROMEOS)
+      feedback_(NULL),
+#endif
       home_(NULL),
       location_bar_(NULL),
       browser_actions_(NULL),
@@ -166,6 +169,16 @@ void ToolbarView::Init(Profile* profile) {
   reload_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_RELOAD));
   reload_->SetID(VIEW_ID_RELOAD_BUTTON);
 
+#if defined(OS_CHROMEOS)
+  feedback_ = new views::ImageButton(this);
+  feedback_->set_tag(IDC_FEEDBACK);
+  feedback_->set_triggerable_event_flags(views::Event::EF_LEFT_BUTTON_DOWN |
+                                       views::Event::EF_MIDDLE_BUTTON_DOWN);
+  feedback_->set_tag(IDC_FEEDBACK);
+  feedback_->SetTooltipText(l10n_util::GetString(IDS_TOOLTIP_FEEDBACK));
+  feedback_->SetID(VIEW_ID_FEEDBACK_BUTTON);
+#endif
+
   home_ = new views::ImageButton(this);
   home_->set_triggerable_event_flags(views::Event::EF_LEFT_BUTTON_DOWN |
                                      views::Event::EF_MIDDLE_BUTTON_DOWN);
@@ -198,6 +211,9 @@ void ToolbarView::Init(Profile* profile) {
   AddChildView(home_);
   AddChildView(location_bar_);
   AddChildView(browser_actions_);
+#if defined(OS_CHROMEOS)
+  AddChildView(feedback_);
+#endif
   AddChildView(app_menu_);
 
   location_bar_->Init();
@@ -449,6 +465,9 @@ gfx::Size ToolbarView::GetPreferredSize() {
         (show_home_button_.GetValue() ?
             (home_->GetPreferredSize().width() + kButtonSpacing) : 0) +
         browser_actions_->GetPreferredSize().width() +
+#if defined(OS_CHROMEOS)
+        feedback_->GetPreferredSize().width() + kButtonSpacing +
+#endif
         app_menu_->GetPreferredSize().width() + kEdgeSpacing;
 
     static SkBitmap normal_background;
@@ -514,9 +533,16 @@ void ToolbarView::Layout() {
   }
 
   int browser_actions_width = browser_actions_->GetPreferredSize().width();
+#if defined(OS_CHROMEOS)
+  int feedback_menu_width = feedback_->GetPreferredSize().width() +
+                            kButtonSpacing;
+#endif
   int app_menu_width = app_menu_->GetPreferredSize().width();
   int location_x = home_->x() + home_->width() + kStandardSpacing;
   int available_width = width() - kEdgeSpacing - app_menu_width -
+#if defined(OS_CHROMEOS)
+      feedback_menu_width -
+#endif
       browser_actions_width - location_x;
 
   location_bar_->SetBounds(location_x, child_y, std::max(available_width, 0),
@@ -533,8 +559,15 @@ void ToolbarView::Layout() {
   //                required.
   browser_actions_->Layout();
 
+#if defined(OS_CHROMEOS)
+  feedback_->SetBounds(browser_actions_->x() + browser_actions_width, child_y,
+                       feedback_->GetPreferredSize().width(), child_height);
+  app_menu_->SetBounds(feedback_->x() + feedback_->width() + kButtonSpacing,
+                       child_y, app_menu_width, child_height);
+#else
   app_menu_->SetBounds(browser_actions_->x() + browser_actions_width, child_y,
                        app_menu_width, child_height);
+#endif
 }
 
 void ToolbarView::Paint(gfx::Canvas* canvas) {
@@ -642,6 +675,15 @@ void ToolbarView::LoadImages() {
   reload_->SetToggledImage(views::CustomButton::BS_DISABLED,
       tp->GetBitmapNamed(IDR_STOP_D));
 
+#if defined(OS_CHROMEOS)
+  feedback_->SetImage(views::CustomButton::BS_NORMAL,
+      tp->GetBitmapNamed(IDR_FEEDBACK));
+  feedback_->SetImage(views::CustomButton::BS_HOT,
+      tp->GetBitmapNamed(IDR_FEEDBACK_H));
+  feedback_->SetImage(views::CustomButton::BS_PUSHED,
+      tp->GetBitmapNamed(IDR_FEEDBACK_P));
+#endif
+
   home_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_HOME));
   home_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_HOME_H));
   home_->SetImage(views::CustomButton::BS_PUSHED,
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index fb4d8ff..3553ed2 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -181,6 +181,9 @@ class ToolbarView : public AccessiblePaneView,
   views::ImageButton* back_;
   views::ImageButton* forward_;
   ReloadButton* reload_;
+#if defined(OS_CHROMEOS)
+  views::ImageButton* feedback_;
+#endif
   views::ImageButton* home_;
   LocationBarView* location_bar_;
   BrowserActionsContainer* browser_actions_;
diff --git a/chrome/browser/view_ids.h b/chrome/browser/view_ids.h
index c1e02a1..948eabb 100644
--- a/chrome/browser/view_ids.h
+++ b/chrome/browser/view_ids.h
@@ -44,6 +44,7 @@ enum ViewID {
   VIEW_ID_APP_MENU,
   VIEW_ID_AUTOCOMPLETE,
   VIEW_ID_BROWSER_ACTION_TOOLBAR,
+  VIEW_ID_FEEDBACK_BUTTON,
 
   // The Bookmark Bar.
   VIEW_ID_BOOKMARK_BAR,
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index da47f0f..647f721 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -6,8 +6,7 @@
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 #pragma once
 
-#include "chrome/browser/ui/views/toolbar_view.h"
+ #include "chrome/browser/ui/views/toolbar_view.h"
 // TODO(beng): remove this file once all includes have been updated.
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
-
diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc
index 30ce063..87ed089 100644
--- a/chrome/browser/wrench_menu_model.cc
+++ b/chrome/browser/wrench_menu_model.cc
@@ -172,7 +172,7 @@ void ToolsMenuModel::Build(Browser* browser) {
 
   AddSeparator();
 #if defined(OS_CHROMEOS)
-  AddItemWithStringId(IDC_REPORT_BUG, IDS_REPORT_BUG);
+  AddItemWithStringId(IDC_FEEDBACK, IDS_FEEDBACK);
   AddSeparator();
 #endif
 
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0c9f439..62185c6 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -713,8 +713,6 @@
         'browser/chromeos/pulse_audio_mixer.h',
         'browser/chromeos/status/clock_menu_button.cc',
         'browser/chromeos/status/clock_menu_button.h',
-        'browser/chromeos/status/feedback_menu_button.cc',
-        'browser/chromeos/status/feedback_menu_button.h',
         'browser/chromeos/status/input_method_menu.cc',
         'browser/chromeos/status/input_method_menu.h',
         'browser/chromeos/status/input_method_menu_button.cc',