summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 04:14:23 +0000
committertbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 04:14:23 +0000
commitdb9733a4c17531bf3ac08ee53faf9d04784427b9 (patch)
tree45144f04d430d6b16c6dd840b86f782b0705efa4
parent8b7d034cb32b95cd36463a23be0eee621146e150 (diff)
downloadchromium_src-db9733a4c17531bf3ac08ee53faf9d04784427b9.zip
chromium_src-db9733a4c17531bf3ac08ee53faf9d04784427b9.tar.gz
chromium_src-db9733a4c17531bf3ac08ee53faf9d04784427b9.tar.bz2
Revert 109813 - Revert 109777 - Request power status update from power manager when power button view gets created.
Also, prepare PowerManagerDbusClient for change in power manager for bug chromium-os:21360 TEST=manual BUG=chromium-os:20832 Review URL: http://codereview.chromium.org/8491054 It broke some ui_tests on linux chromeos TBR=tbarzic@chromium.org Review URL: http://codereview.chromium.org/8551005 ui_tests should be happy now TBR=tbarzic@chromium.org Review URL: http://codereview.chromium.org/8564041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110041 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/status/power_menu_button.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
index 4783238..b4523e4 100644
--- a/chrome/browser/chromeos/status/power_menu_button.cc
+++ b/chrome/browser/chromeos/status/power_menu_button.cc
@@ -217,6 +217,7 @@ PowerMenuButton::PowerMenuButton(StatusAreaButton::Delegate* delegate)
set_id(VIEW_ID_STATUS_BUTTON_POWER);
UpdateIconAndLabelInfo();
DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
+ DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate();
}
PowerMenuButton::~PowerMenuButton() {