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

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

Issue 2774093002: Change PowerStatus::GetBatteryImage to not use ExtractImageRep and scale (Closed)
Patch Set: powericon: . 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.cc
diff --git a/ash/common/system/chromeos/power/power_status_view.cc b/ash/common/system/chromeos/power/power_status_view.cc
index 3e918b98496f4f9c1f728cc96a27d14a1732124a..bef2e0680c3c1f6c157c201b67c59a62bebec71c 100644
--- a/ash/common/system/chromeos/power/power_status_view.cc
+++ b/ash/common/system/chromeos/power/power_status_view.cc
@@ -51,20 +51,6 @@ PowerStatusView::~PowerStatusView() {
void PowerStatusView::OnPowerStatusChanged() {
UpdateText();
-
- // We do not show a battery icon in the material design system menu.
- // TODO(tdanderson): Remove the non-MD code and the IconSet enum once
- // material design is enabled by default. See crbug.com/614453.
- if (MaterialDesignController::UseMaterialDesignSystemIcons())
- return;
-
- const PowerStatus::BatteryImageInfo info =
- PowerStatus::Get()->GetBatteryImageInfo(PowerStatus::ICON_DARK);
- if (info != previous_battery_image_info_) {
Peter Kasting 2017/03/31 22:07:20 Looks like this member variable is now dead and sh
danakj 2017/04/03 14:43:14 Done.
- icon_->SetImage(PowerStatus::Get()->GetBatteryImage(info));
Peter Kasting 2017/03/31 22:07:20 Looks like we no longer need to track this pointer
danakj 2017/04/03 14:43:14 Done.
- icon_->SetVisible(true);
- previous_battery_image_info_ = info;
- }
}
void PowerStatusView::LayoutView() {
« no previous file with comments | « ash/common/system/chromeos/power/power_status_unittest.cc ('k') | ash/common/system/chromeos/power/tray_power.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698