Revert 47749 - Integrated new bug icon in status bar. It opens bug reporting dialog.

BUG=chromiumos:3348
TEST=click on the new bug icon in the status bar, it should open bug reporting dialog

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

TBR=zelidrag@chromium.org
Review URL: http://codereview.chromium.org/2125013

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

13 files changed, 0 insertions, 270 deletions

diff --git a/chrome/app/theme/statusbar_feedback.png b/chrome/app/theme/statusbar_feedback.png
deleted file mode 100644
index c371365..0000000
--- a/chrome/app/theme/statusbar_feedback.png
+++ /dev/null
diff --git a/chrome/app/theme/statusbar_feedback_pressed.png b/chrome/app/theme/statusbar_feedback_pressed.png
deleted file mode 100644
index e76a33e..0000000
--- a/chrome/app/theme/statusbar_feedback_pressed.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 126b546..f3c3b3a 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -490,9 +490,6 @@
         <include name="IDR_STATUSBAR_NETWORK_WIRED_PRESSED" file="statusbar_network_wired_pressed.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_STATUSBAR_FEEDBACK" file="statusbar_feedback.png" type="BINDATA" />
-        <include name="IDR_STATUSBAR_FEEDBACK_PRESSED" file="statusbar_feedback_pressed.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/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index c1b3f6b..1eac964 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -455,10 +455,6 @@ bool BrowserView::ShouldOpenButtonOptions(
   return true;
 }
 
-void BrowserView::ExecuteBrowserCommand(int id) const {
-  browser()->ExecuteCommand(id);
-}
-
 void BrowserView::OpenButtonOptions(const views::View* button_view) const {
   if (button_view == status_area_->network_view()) {
     browser()->OpenInternetOptionsDialog();
diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h
index 423aa50..2a414bd 100644
--- a/chrome/browser/chromeos/frame/browser_view.h
+++ b/chrome/browser/chromeos/frame/browser_view.h
@@ -74,7 +74,6 @@ class BrowserView : public ::BrowserView,
   virtual gfx::NativeWindow GetNativeWindow() const;
   virtual bool ShouldOpenButtonOptions(
       const views::View* button_view) const;
-  virtual void ExecuteBrowserCommand(int id) const;
   virtual void OpenButtonOptions(const views::View* button_view) const;
   virtual bool IsButtonVisible(const views::View* button_view) const;
   virtual bool IsBrowserMode() const;
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index 2d68717..7f07c3e 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -10,7 +10,6 @@
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
-#include "chrome/browser/chromeos/status/feedback_menu_button.h"
 #include "chrome/browser/chromeos/status/language_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
@@ -127,7 +126,6 @@ gfx::NativeWindow BackgroundView::GetNativeWindow() const {
 bool BackgroundView::ShouldOpenButtonOptions(
     const views::View* button_view) const {
   if (button_view == status_area_->clock_view() ||
-      button_view == status_area_->feedback_view() ||
       button_view == status_area_->language_view() ||
       button_view == status_area_->network_view()) {
     return false;
diff --git a/chrome/browser/chromeos/login/background_view.h b/chrome/browser/chromeos/login/background_view.h
index b7d9477..135129d 100644
--- a/chrome/browser/chromeos/login/background_view.h
+++ b/chrome/browser/chromeos/login/background_view.h
@@ -47,7 +47,6 @@ class BackgroundView : public views::View, public StatusAreaHost {
   // Overridden from StatusAreaHost:
   virtual Profile* GetProfile() const { return NULL; }
   virtual gfx::NativeWindow GetNativeWindow() const;
-  virtual void ExecuteBrowserCommand(int id) const {}
   virtual bool ShouldOpenButtonOptions(
       const views::View* button_view) const;
   virtual void OpenButtonOptions(const views::View* button_view) const;
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 1343fa8..0000000
--- a/chrome/browser/chromeos/status/feedback_menu_button.cc
+++ /dev/null
@@ -1,113 +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/resource_bundle.h"
-#include "chrome/app/chrome_dll_resource.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 {
-
-////////////////////////////////////////////////////////////////////////////////
-// LanguageMenuButton
-
-FeedbackMenuButton::FeedbackMenuButton(StatusAreaHost* host)
-    : StatusAreaButton(this),
-      host_(host) {
-  DCHECK(host_);
-}
-
-FeedbackMenuButton::~FeedbackMenuButton() {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// FeedbackMenuButton, StatusAreaButton implementation:
-
-void FeedbackMenuButton::DrawPressed(gfx::Canvas* canvas) {
-  DrawFeedbackIcon(canvas, *ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_STATUSBAR_FEEDBACK_PRESSED));
-}
-
-void FeedbackMenuButton::DrawIcon(gfx::Canvas* canvas) {
-  DrawFeedbackIcon(canvas, *ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_STATUSBAR_FEEDBACK));
-}
-
-void FeedbackMenuButton::DrawFeedbackIcon(gfx::Canvas* canvas, SkBitmap icon) {
-  // Draw the battery icon 5 pixels down to center it.
-  static const int kIconVerticalPadding = 5;
-  canvas->DrawBitmapInt(icon, 0, kIconVerticalPadding);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// PowerMenuButton, views::ViewMenuDelegate implementation:
-
-void FeedbackMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
-  DCHECK(host_);
-  host_->ExecuteBrowserCommand(IDC_REPORT_BUG);
-}
-
-}  // namespace chromeos
-// 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/resource_bundle.h"
-#include "chrome/app/chrome_dll_resource.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 {
-
-////////////////////////////////////////////////////////////////////////////////
-// LanguageMenuButton
-
-FeedbackMenuButton::FeedbackMenuButton(StatusAreaHost* host)
-    : StatusAreaButton(this),
-      host_(host) {
-  DCHECK(host_);
-}
-
-FeedbackMenuButton::~FeedbackMenuButton() {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// FeedbackMenuButton, StatusAreaButton implementation:
-
-void FeedbackMenuButton::DrawPressed(gfx::Canvas* canvas) {
-  DrawFeedbackIcon(canvas, *ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_STATUSBAR_FEEDBACK_PRESSED));
-}
-
-void FeedbackMenuButton::DrawIcon(gfx::Canvas* canvas) {
-  DrawFeedbackIcon(canvas, *ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_STATUSBAR_FEEDBACK));
-}
-
-void FeedbackMenuButton::DrawFeedbackIcon(gfx::Canvas* canvas, SkBitmap icon) {
-  static const int kIconVerticalPadding = 5;
-  canvas->DrawBitmapInt(icon, 0, kIconVerticalPadding);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// 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 91aae7e..0000000
--- a/chrome/browser/chromeos/status/feedback_menu_button.h
+++ /dev/null
@@ -1,132 +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_
-
-#include "app/menus/simple_menu_model.h"
-#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:
-  // StatusAreaButton implementation.
-  virtual void DrawPressed(gfx::Canvas* canvas);
-  virtual void DrawIcon(gfx::Canvas* canvas);
-
-  // 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 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() {}
-
-  // This method will draw the |icon| in the appropriate place on the |canvas|.
-  void DrawFeedbackIcon(gfx::Canvas* canvas, SkBitmap icon);
-
-  StatusAreaHost* host_;
-
-  DISALLOW_COPY_AND_ASSIGN(FeedbackMenuButton);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_STATUS_FEEDBACK_MENU_BUTTON_H_
-// 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_
-
-#include "app/menus/simple_menu_model.h"
-#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:
-  // StatusAreaButton implementation.
-  virtual void DrawPressed(gfx::Canvas* canvas);
-  virtual void DrawIcon(gfx::Canvas* canvas);
-
-  // 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 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() {}
-
-  // This method will draw the |icon| in the appropriate place on the |canvas|.
-  void DrawFeedbackIcon(gfx::Canvas* canvas, SkBitmap icon);
-
-  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_host.h b/chrome/browser/chromeos/status/status_area_host.h
index 434da9b..b236e31 100644
--- a/chrome/browser/chromeos/status/status_area_host.h
+++ b/chrome/browser/chromeos/status/status_area_host.h
@@ -34,9 +34,6 @@ class StatusAreaHost {
   // Opens options dialog related to the button specified.
   virtual void OpenButtonOptions(const views::View* button_view) const = 0;
 
-  // Executes browser command.
-  virtual void ExecuteBrowserCommand(int id) const = 0;
-
   // Indicates if the button specified should be visible at the moment.
   virtual bool IsButtonVisible(const views::View* button_view) const = 0;
 
diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc
index bd4fde8..75d6c30 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/language_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/power_menu_button.h"
@@ -29,7 +28,6 @@ StatusAreaView::OpenTabsMode StatusAreaView::open_tabs_mode_ =
 StatusAreaView::StatusAreaView(StatusAreaHost* host)
     : host_(host),
       clock_view_(NULL),
-      feedback_view_(NULL),
       language_view_(NULL),
       network_view_(NULL),
       power_view_(NULL) {
@@ -40,10 +38,6 @@ void StatusAreaView::Init() {
   language_view_ = new LanguageMenuButton(host_);
   AddChildView(language_view_);
 
-  // Feedback.
-  feedback_view_ = new FeedbackMenuButton(host_);
-  AddChildView(feedback_view_);
-
   // Network.
   network_view_ = new NetworkMenuButton(host_);
   AddChildView(network_view_);
diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h
index c760779..28847b7 100644
--- a/chrome/browser/chromeos/status/status_area_view.h
+++ b/chrome/browser/chromeos/status/status_area_view.h
@@ -11,7 +11,6 @@
 namespace chromeos {
 
 class ClockMenuButton;
-class FeedbackMenuButton;
 class LanguageMenuButton;
 class NetworkMenuButton;
 class PowerMenuButton;
@@ -45,7 +44,6 @@ class StatusAreaView : public views::View {
   static void SetOpenTabsMode(OpenTabsMode mode);
 
   ClockMenuButton* clock_view() { return clock_view_; }
-  FeedbackMenuButton* feedback_view() { return feedback_view_; }
   LanguageMenuButton* language_view() { return language_view_; }
   NetworkMenuButton* network_view() { return network_view_; }
   PowerMenuButton* power_view() { return power_view_; }
@@ -54,7 +52,6 @@ class StatusAreaView : public views::View {
   StatusAreaHost* host_;
 
   ClockMenuButton* clock_view_;
-  FeedbackMenuButton* feedback_view_;
   LanguageMenuButton* language_view_;
   NetworkMenuButton* network_view_;
   PowerMenuButton* power_view_;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6abef35..523a30a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -488,8 +488,6 @@
         'browser/chromeos/status/browser_status_area_view.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/language_menu_button.cc',
         'browser/chromeos/status/language_menu_button.h',
         'browser/chromeos/status/language_menu_l10n_util.cc',