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

Unified Diff: ash/common/system/chromeos/power/power_status_view.h

Issue 2795823002: Remove pre-MD code from PowerStatusView. (Closed)
Patch Set: . Created 3 years, 9 months 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: ash/common/system/chromeos/power/power_status_view.h
diff --git a/ash/common/system/chromeos/power/power_status_view.h b/ash/common/system/chromeos/power/power_status_view.h
index 1cd5cee9ac3bdda601bdbc68555687badb33f699..b7a1b1eb32790380d13427d68da3830bb34c8960 100644
--- a/ash/common/system/chromeos/power/power_status_view.h
+++ b/ash/common/system/chromeos/power/power_status_view.h
@@ -12,7 +12,6 @@
#include "ui/views/view.h"
namespace views {
-class ImageView;
class Label;
}
@@ -21,7 +20,7 @@ namespace ash {
class ASH_EXPORT PowerStatusView : public views::View,
public PowerStatus::Observer {
public:
- explicit PowerStatusView(bool default_view_right_align);
+ PowerStatusView();
~PowerStatusView() override;
// views::View:
@@ -34,28 +33,15 @@ class ASH_EXPORT PowerStatusView : public views::View,
private:
friend class PowerStatusViewTest;
- void LayoutView();
void UpdateText();
// views::View:
void ChildPreferredSizeChanged(views::View* child) override;
- // Layout default view UI items on the right side of system tray pop up item
- // if true; otherwise, layout the UI items on the left side.
- bool default_view_right_align_;
-
views::Label* percentage_label_;
views::Label* separator_label_;
views::Label* time_status_label_;
- // Battery status indicator icon. Unused in material design.
- views::ImageView* icon_;
-
- // Information about the image last used to update |icon_|. Cached to avoid
- // unnecessary updates (http://crbug.com/589348).
- PowerStatus::BatteryImageInfo previous_battery_image_info_;
-
- // Only used in material design.
base::string16 accessible_name_;
DISALLOW_COPY_AND_ASSIGN(PowerStatusView);

Powered by Google App Engine
This is Rietveld 408576698