| 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 ade3d0b021a93de634a267cd9a47af7e350aad20..5e01f6d5fd9069c031fa220bd9e3ab184974ccd3 100644
|
| --- a/ash/common/system/chromeos/power/power_status_view.cc
|
| +++ b/ash/common/system/chromeos/power/power_status_view.cc
|
| @@ -139,16 +139,14 @@ void PowerStatusView::UpdateText() {
|
| time_status_label_->SetVisible(!battery_time_status.empty());
|
| time_status_label_->SetText(battery_time_status);
|
|
|
| - if (MaterialDesignController::IsSystemTrayMenuMaterial())
|
| + if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
|
| accessible_name_ = PowerStatus::Get()->GetAccessibleNameString(true);
|
| -}
|
|
|
| -void PowerStatusView::UpdateStyle() {
|
| - TrayPopupItemStyle style(GetNativeTheme(),
|
| - TrayPopupItemStyle::FontStyle::SYSTEM_INFO);
|
| - style.SetupLabel(percentage_label_);
|
| - style.SetupLabel(separator_label_);
|
| - style.SetupLabel(time_status_label_);
|
| + TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SYSTEM_INFO);
|
| + style.SetupLabel(percentage_label_);
|
| + style.SetupLabel(separator_label_);
|
| + style.SetupLabel(time_status_label_);
|
| + }
|
| }
|
|
|
| void PowerStatusView::ChildPreferredSizeChanged(views::View* child) {
|
| @@ -167,10 +165,6 @@ void PowerStatusView::Layout() {
|
| }
|
| }
|
|
|
| -void PowerStatusView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
|
| - UpdateStyle();
|
| -}
|
| -
|
| void PowerStatusView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
|
| if (!MaterialDesignController::IsSystemTrayMenuMaterial())
|
| return;
|
|
|