Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 1 insertions, 6 deletions

diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h
index 7f27333..b3503e8 100644
--- a/chrome/browser/chromeos/status/power_menu_button.h
+++ b/chrome/browser/chromeos/status/power_menu_button.h
@@ -57,17 +57,12 @@ class PowerMenuButton : public StatusAreaButton,
   int icon_id() const { return icon_id_; }
 
  protected:
-  // StatusAreaButton implementation.
-  virtual void DrawPressed(gfx::Canvas* canvas);
-  virtual void DrawIcon(gfx::Canvas* canvas);
+  virtual int icon_width() { return 26; }
 
  private:
   // views::ViewMenuDelegate implementation.
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
-  // This method will draw the |icon| in the appropriate place on the |canvas|.
-  void DrawPowerIcon(gfx::Canvas* canvas, SkBitmap icon);
-
   // Update the power icon and menu label info depending on the power status.
   void UpdateIconAndLabelInfo();