Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Unified Diff: chrome/browser/chromeos/status/power_menu_button.cc

Issue 8438064: Separate StatusAreaView from StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Clang fixes + fixup Delegate Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/power_menu_button.cc
diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
index 468adfd7852cfc358cfa945be45fafb55d0f9560..df35f7a9cc3d39ee249e1d11daab5deabed9c3d4 100644
--- a/chrome/browser/chromeos/status/power_menu_button.cc
+++ b/chrome/browser/chromeos/status/power_menu_button.cc
@@ -12,6 +12,7 @@
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/view_ids.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -244,8 +245,8 @@ class PowerMenuButton::StatusView : public View {
////////////////////////////////////////////////////////////////////////////////
// PowerMenuButton
-PowerMenuButton::PowerMenuButton(StatusAreaHost* host)
- : StatusAreaButton(host, this),
+PowerMenuButton::PowerMenuButton(StatusAreaButton::Delegate* delegate)
+ : StatusAreaButton(delegate, this),
battery_is_present_(false),
line_power_on_(false),
battery_percentage_(0.0),
@@ -253,6 +254,7 @@ PowerMenuButton::PowerMenuButton(StatusAreaHost* host)
battery_time_to_full_(TimeDelta::FromMicroseconds(kInitialMS)),
battery_time_to_empty_(TimeDelta::FromMicroseconds(kInitialMS)),
status_(NULL) {
+ set_id(VIEW_ID_STATUS_BUTTON_POWER);
UpdateIconAndLabelInfo();
CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
}

Powered by Google App Engine
This is Rietveld 408576698