diff options
author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 21:53:03 +0000 |
---|---|---|
committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-03 21:53:03 +0000 |
commit | d1d67d89bbb69e71f50ba9a0e6ede189f0ae1cff (patch) | |
tree | f355d21bf601dc4fa54b59e8dbd66f418e5032bc | |
parent | 28924dab021b0d0ae89641abd8552e68e6979201 (diff) | |
download | chromium_src-d1d67d89bbb69e71f50ba9a0e6ede189f0ae1cff.zip chromium_src-d1d67d89bbb69e71f50ba9a0e6ede189f0ae1cff.tar.gz chromium_src-d1d67d89bbb69e71f50ba9a0e6ede189f0ae1cff.tar.bz2 |
Remove unnecessary override of GetLabel in PowerMenuButton.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/9316027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120412 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/chromeos/status/power_menu_button.cc | 8 | ||||
-rw-r--r-- | chrome/browser/chromeos/status/power_menu_button.h | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc index 51bdb56..8e9d020 100644 --- a/chrome/browser/chromeos/status/power_menu_button.cc +++ b/chrome/browser/chromeos/status/power_menu_button.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -221,12 +221,6 @@ PowerMenuButton::~PowerMenuButton() { DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this); } -// PowerMenuButton, views::MenuDelegate implementation: - -string16 PowerMenuButton::GetLabel(int id) const { - return string16(); -} - string16 PowerMenuButton::GetBatteryIsChargedText() const { // The second item shows the battery is charged if it is. if (battery_percentage_ >= 100 && line_power_on_) diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h index 165e54b..c30c39c 100644 --- a/chrome/browser/chromeos/status/power_menu_button.h +++ b/chrome/browser/chromeos/status/power_menu_button.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -34,9 +34,6 @@ class PowerMenuButton : public StatusAreaButton, explicit PowerMenuButton(StatusAreaButton::Delegate* delegate); virtual ~PowerMenuButton(); - // views::MenuDelegate implementation. - virtual string16 GetLabel(int id) const OVERRIDE; - // PowerManagerClient::Observer implementation. virtual void PowerChanged(const PowerSupplyStatus& power_status) OVERRIDE; virtual void SystemResumed() OVERRIDE {} |