diff --git a/ash/resources/vector_icons/BUILD.gn b/ash/resources/vector_icons/BUILD.gn index 843335afc617d2..ac480c273fd70b 100644 --- a/ash/resources/vector_icons/BUILD.gn +++ b/ash/resources/vector_icons/BUILD.gn @@ -224,7 +224,6 @@ aggregate_vector_icons("ash_vector_icons") { "persistent_desks_bar_visible.icon", "phone_hub_battery_saver.icon", "phone_hub_battery_saver_outline.icon", - "phone_hub_battery_saver_outline_mask.icon", "phone_hub_camera_roll_item_video.icon", "phone_hub_camera_roll_menu_download.icon", "phone_hub_default_favicon.icon", @@ -420,16 +419,12 @@ aggregate_vector_icons("ash_vector_icons") { "unified_menu_accessibility.icon", "unified_menu_battery_alert.icon", "unified_menu_battery_alert_outline.icon", - "unified_menu_battery_alert_outline_mask.icon", "unified_menu_battery_bolt.icon", "unified_menu_battery_bolt_outline.icon", - "unified_menu_battery_bolt_outline_mask.icon", "unified_menu_battery_unreliable.icon", "unified_menu_battery_unreliable_outline.icon", - "unified_menu_battery_unreliable_outline_mask.icon", "unified_menu_battery_x.icon", "unified_menu_battery_x_outline.icon", - "unified_menu_battery_x_outline_mask.icon", "unified_menu_bluetooth.icon", "unified_menu_bluetooth_connected.icon", "unified_menu_bluetooth_connected_legacy.icon", diff --git a/ash/resources/vector_icons/phone_hub_battery_saver_outline_mask.icon b/ash/resources/vector_icons/phone_hub_battery_saver_outline_mask.icon deleted file mode 100644 index 33dfd3ceb7ad6c..00000000000000 --- a/ash/resources/vector_icons/phone_hub_battery_saver_outline_mask.icon +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -CANVAS_DIMENSIONS, 20, -PATH_MODE_CLEAR, -MOVE_TO, 10.59f, 9.85f, -R_LINE_TO, 2.36f, 0, -R_V_LINE_TO, 1.18f, -R_H_LINE_TO, -2.36f, -R_V_LINE_TO, 2.36f, -H_LINE_TO, 9.41f, -R_LINE_TO, 0, -2.36f, -H_LINE_TO, 7.05f, -R_LINE_TO, 0, -1.18f, -R_LINE_TO, 2.36f, 0, -R_LINE_TO, 0, -2.36f, -R_H_LINE_TO, 1.18f, -V_LINE_TO, 9.85f, -CLOSE, -R_MOVE_TO, -1.78f, -0.6f, -R_LINE_TO, 0, -1.76f, -R_CUBIC_TO, 0, -0.16f, 0.06f, -0.31f, 0.18f, -0.42f, -R_CUBIC_TO, 0.11f, -0.11f, 0.27f, -0.18f, 0.42f, -0.18f, -R_H_LINE_TO, 1.18f, -R_CUBIC_TO, 0.16f, 0, 0.31f, 0.06f, 0.42f, 0.18f, -R_CUBIC_TO, 0.11f, 0.11f, 0.18f, 0.27f, 0.18f, 0.42f, -V_LINE_TO, 9.25f, -R_H_LINE_TO, 1.76f, -R_CUBIC_TO, 0.33f, 0, 0.6f, 0.27f, 0.6f, 0.6f, -R_V_LINE_TO, 1.18f, -R_CUBIC_TO, 0, 0.16f, -0.06f, 0.31f, -0.18f, 0.42f, -R_CUBIC_TO, -0.11f, 0.11f, -0.27f, 0.18f, -0.42f, 0.18f, -R_H_LINE_TO, -1.76f, -R_V_LINE_TO, 1.76f, -R_CUBIC_TO, 0, 0.16f, -0.06f, 0.31f, -0.18f, 0.42f, -R_CUBIC_TO, -0.11f, 0.11f, -0.27f, 0.18f, -0.42f, 0.18f, -R_LINE_TO, -1.18f, 0, -R_CUBIC_TO, -0.33f, 0, -0.6f, -0.27f, -0.6f, -0.6f, -R_V_LINE_TO, -1.76f, -H_LINE_TO, 7.05f, -R_CUBIC_TO, -0.33f, 0, -0.6f, -0.27f, -0.6f, -0.6f, -R_LINE_TO, 0, -1.18f, -R_CUBIC_TO, 0, -0.16f, 0.06f, -0.31f, 0.18f, -0.42f, -R_CUBIC_TO, 0.11f, -0.11f, 0.27f, -0.18f, 0.42f, -0.18f, -R_H_LINE_TO, 1.76f, -CLOSE diff --git a/ash/resources/vector_icons/unified_menu_battery_alert_outline_mask.icon b/ash/resources/vector_icons/unified_menu_battery_alert_outline_mask.icon deleted file mode 100644 index 8e1f6c76d9d7ef..00000000000000 --- a/ash/resources/vector_icons/unified_menu_battery_alert_outline_mask.icon +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -CANVAS_DIMENSIONS, 20, -PATH_MODE_CLEAR, -MOVE_TO, 11.55f, 6.5f, -CUBIC_TO, 11.55f, 6.06f, 11.19f, 5.7f, 10.75f, 5.7f, -H_LINE_TO, 9.25f, -CUBIC_TO, 8.81f, 5.7f, 8.45f, 6.06f, 8.45f, 6.5f, -V_LINE_TO, 12, -CUBIC_TO, 8.45f, 12.19f, 8.52f, 12.36f, 8.63f, 12.5f, -CUBIC_TO, 8.52f, 12.64f, 8.45f, 12.81f, 8.45f, 13, -V_LINE_TO, 14.5f, -CUBIC_TO, 8.45f, 14.94f, 8.81f, 15.3f, 9.25f, 15.3f, -H_LINE_TO, 10.75f, -CUBIC_TO, 11.19f, 15.3f, 11.55f, 14.94f, 11.55f, 14.5f, -V_LINE_TO, 13, -CUBIC_TO, 11.55f, 12.81f, 11.48f, 12.64f, 11.37f, 12.5f, -CUBIC_TO, 11.48f, 12.36f, 11.55f, 12.19f, 11.55f, 12, -V_LINE_TO, 6.5f, -CLOSE, -MOVE_TO, 10.75f, 6.5f, -V_LINE_TO, 12, -H_LINE_TO, 9.25f, -V_LINE_TO, 6.5f, -H_LINE_TO, 10.75f, -CLOSE, -MOVE_TO, 10.75f, 13, -V_LINE_TO, 14.5f, -H_LINE_TO, 9.25f, -V_LINE_TO, 13, -H_LINE_TO, 10.75f, -CLOSE diff --git a/ash/resources/vector_icons/unified_menu_battery_bolt_outline_mask.icon b/ash/resources/vector_icons/unified_menu_battery_bolt_outline_mask.icon deleted file mode 100644 index 430301d933cf9b..00000000000000 --- a/ash/resources/vector_icons/unified_menu_battery_bolt_outline_mask.icon +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -CANVAS_DIMENSIONS, 20, -PATH_MODE_CLEAR, -MOVE_TO, 7.25f, 11.44f, -CUBIC_TO, 7.1f, 11.21f, 7.09f, 10.91f, 7.21f, 10.67f, -LINE_TO, 9.98f, 5.14f, -CUBIC_TO, 10.14f, 4.81f, 10.51f, 4.64f, 10.87f, 4.72f, -CUBIC_TO, 11.24f, 4.81f, 11.49f, 5.13f, 11.49f, 5.5f, -V_LINE_TO, 8.84f, -H_LINE_TO, 12.07f, -CUBIC_TO, 12.35f, 8.84f, 12.61f, 8.99f, 12.75f, 9.22f, -CUBIC_TO, 12.9f, 9.46f, 12.91f, 9.75f, 12.79f, 10, -LINE_TO, 10.03f, 15.52f, -CUBIC_TO, 9.86f, 15.86f, 9.49f, 16.03f, 9.13f, 15.95f, -CUBIC_TO, 8.76f, 15.86f, 8.51f, 15.54f, 8.51f, 15.17f, -V_LINE_TO, 11.82f, -H_LINE_TO, 7.93f, -CUBIC_TO, 7.65f, 11.82f, 7.39f, 11.68f, 7.25f, 11.44f, -CLOSE, -MOVE_TO, 9.31f, 11.02f, -V_LINE_TO, 15.17f, -LINE_TO, 12.07f, 9.64f, -H_LINE_TO, 10.69f, -V_LINE_TO, 5.5f, -LINE_TO, 7.93f, 11.02f, -H_LINE_TO, 9.31f, -CLOSE diff --git a/ash/resources/vector_icons/unified_menu_battery_unreliable_outline_mask.icon b/ash/resources/vector_icons/unified_menu_battery_unreliable_outline_mask.icon deleted file mode 100644 index dfddfda8936a96..00000000000000 --- a/ash/resources/vector_icons/unified_menu_battery_unreliable_outline_mask.icon +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -CANVAS_DIMENSIONS, 20, -PATH_MODE_CLEAR, -MOVE_TO, 12.5f, 8.97f, -CUBIC_TO, 12.94f, 8.97f, 13.3f, 9.32f, 13.3f, 9.77f, -V_LINE_TO, 11.27f, -H_LINE_TO, 12.5f, -V_LINE_TO, 9.77f, -CUBIC_TO, 12.5f, 9.77f, 12.5f, 10.38f, 11.7f, 10.48f, -CUBIC_TO, 11.62f, 10.49f, 11.54f, 10.5f, 11.44f, 10.5f, -CUBIC_TO, 10.92f, 10.5f, 10.49f, 10.13f, 10.05f, 9.76f, -CUBIC_TO, 9.6f, 9.38f, 9.15f, 9, 8.6f, 9, -CUBIC_TO, 7.5f, 9, 7.5f, 9.77f, 7.5f, 9.77f, -CUBIC_TO, 6.7f, 9.77f, 6.7f, 9.77f, 6.7f, 9.77f, -LINE_TO, 6.7f, 9.76f, -LINE_TO, 6.7f, 9.76f, -LINE_TO, 6.7f, 9.76f, -LINE_TO, 6.7f, 9.75f, -CUBIC_TO, 6.7f, 9.74f, 6.7f, 9.73f, 6.7f, 9.72f, -CUBIC_TO, 6.7f, 9.7f, 6.7f, 9.68f, 6.71f, 9.65f, -CUBIC_TO, 6.71f, 9.6f, 6.72f, 9.54f, 6.74f, 9.46f, -CUBIC_TO, 6.77f, 9.31f, 6.84f, 9.12f, 6.99f, 8.92f, -CUBIC_TO, 7.3f, 8.48f, 7.84f, 8.2f, 8.6f, 8.2f, -CUBIC_TO, 9.45f, 8.2f, 10.1f, 8.76f, 10.5f, 9.09f, -CUBIC_TO, 10.52f, 9.11f, 10.53f, 9.12f, 10.55f, 9.14f, -CUBIC_TO, 10.79f, 9.34f, 10.96f, 9.48f, 11.12f, 9.58f, -CUBIC_TO, 11.28f, 9.68f, 11.38f, 9.7f, 11.44f, 9.7f, -CUBIC_TO, 11.59f, 9.7f, 11.67f, 9.68f, 11.71f, 9.66f, -CUBIC_TO, 11.76f, 9.27f, 12.09f, 8.97f, 12.5f, 8.97f, -CLOSE, -MOVE_TO, 11.73f, 9.65f, -CUBIC_TO, 11.74f, 9.65f, 11.74f, 9.64f, 11.74f, 9.64f, -CUBIC_TO, 11.74f, 9.65f, 11.74f, 9.65f, 11.73f, 9.65f, -CLOSE, -MOVE_TO, 7.5f, 9.77f, -H_LINE_TO, 6.7f, -V_LINE_TO, 11.27f, -CUBIC_TO, 6.7f, 11.71f, 7.06f, 12.07f, 7.5f, 12.07f, -CUBIC_TO, 7.91f, 12.07f, 8.26f, 11.75f, 8.3f, 11.35f, -CUBIC_TO, 8.33f, 11.33f, 8.42f, 11.3f, 8.6f, 11.3f, -CUBIC_TO, 8.8f, 11.3f, 9.02f, 11.44f, 9.52f, 11.86f, -CUBIC_TO, 9.53f, 11.87f, 9.54f, 11.88f, 9.55f, 11.89f, -CUBIC_TO, 9.75f, 12.06f, 10.01f, 12.28f, 10.29f, 12.45f, -CUBIC_TO, 10.6f, 12.63f, 10.98f, 12.8f, 11.44f, 12.8f, -CUBIC_TO, 12.18f, 12.8f, 12.71f, 12.53f, 13.02f, 12.1f, -CUBIC_TO, 13.16f, 11.91f, 13.23f, 11.71f, 13.26f, 11.57f, -CUBIC_TO, 13.28f, 11.49f, 13.29f, 11.43f, 13.29f, 11.38f, -CUBIC_TO, 13.3f, 11.35f, 13.3f, 11.33f, 13.3f, 11.31f, -CUBIC_TO, 13.3f, 11.3f, 13.3f, 11.3f, 13.3f, 11.29f, -LINE_TO, 13.3f, 11.28f, -LINE_TO, 13.3f, 11.27f, -LINE_TO, 13.3f, 11.27f, -LINE_TO, 13.3f, 11.27f, -CUBIC_TO, 13.3f, 11.27f, 13.3f, 11.27f, 12.5f, 11.27f, -CUBIC_TO, 12.5f, 11.27f, 12.5f, 12, 11.44f, 12, -CUBIC_TO, 10.92f, 12, 10.49f, 11.63f, 10.05f, 11.26f, -CUBIC_TO, 9.6f, 10.88f, 9.15f, 10.5f, 8.6f, 10.5f, -CUBIC_TO, 8.49f, 10.5f, 8.39f, 10.51f, 8.3f, 10.52f, -CUBIC_TO, 7.5f, 10.64f, 7.5f, 11.27f, 7.5f, 11.27f, -V_LINE_TO, 9.77f, -CLOSE, -MOVE_TO, 8.28f, 11.35f, -CUBIC_TO, 8.28f, 11.36f, 8.27f, 11.36f, 8.27f, 11.36f, -CUBIC_TO, 8.27f, 11.36f, 8.27f, 11.36f, 8.28f, 11.35f, -CLOSE diff --git a/ash/resources/vector_icons/unified_menu_battery_x_outline_mask.icon b/ash/resources/vector_icons/unified_menu_battery_x_outline_mask.icon deleted file mode 100644 index 3a4fa8a096ce25..00000000000000 --- a/ash/resources/vector_icons/unified_menu_battery_x_outline_mask.icon +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2022 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -CANVAS_DIMENSIONS, 20, -PATH_MODE_CLEAR, -MOVE_TO, 10, 9.77f, -LINE_TO, 11.67f, 8.1f, -LINE_TO, 12.5f, 8.93f, -LINE_TO, 10.83f, 10.6f, -LINE_TO, 12.5f, 12.27f, -LINE_TO, 11.67f, 13.1f, -LINE_TO, 10, 11.43f, -LINE_TO, 8.33f, 13.1f, -LINE_TO, 7.5f, 12.27f, -LINE_TO, 9.17f, 10.6f, -LINE_TO, 7.5f, 8.93f, -LINE_TO, 8.33f, 8.1f, -LINE_TO, 10, 9.77f, -CLOSE, -MOVE_TO, 8.32f, 10.6f, -LINE_TO, 7.08f, 9.36f, -CUBIC_TO, 6.96f, 9.25f, 6.9f, 9.09f, 6.9f, 8.93f, -CUBIC_TO, 6.9f, 8.77f, 6.96f, 8.62f, 7.08f, 8.51f, -LINE_TO, 7.91f, 7.68f, -CUBIC_TO, 8.02f, 7.56f, 8.17f, 7.5f, 8.33f, 7.5f, -CUBIC_TO, 8.49f, 7.5f, 8.64f, 7.56f, 8.76f, 7.68f, -LINE_TO, 10, 8.92f, -LINE_TO, 11.24f, 7.68f, -CUBIC_TO, 11.48f, 7.44f, 11.86f, 7.44f, 12.09f, 7.68f, -LINE_TO, 12.92f, 8.51f, -CUBIC_TO, 13.04f, 8.62f, 13.1f, 8.77f, 13.1f, 8.93f, -CUBIC_TO, 13.1f, 9.09f, 13.04f, 9.25f, 12.92f, 9.36f, -LINE_TO, 11.68f, 10.6f, -LINE_TO, 12.92f, 11.84f, -CUBIC_TO, 13.04f, 11.95f, 13.1f, 12.11f, 13.1f, 12.27f, -CUBIC_TO, 13.1f, 12.43f, 13.04f, 12.58f, 12.92f, 12.69f, -LINE_TO, 12.09f, 13.52f, -CUBIC_TO, 11.86f, 13.76f, 11.48f, 13.76f, 11.24f, 13.52f, -LINE_TO, 10, 12.28f, -LINE_TO, 8.76f, 13.52f, -CUBIC_TO, 8.52f, 13.76f, 8.14f, 13.76f, 7.91f, 13.52f, -LINE_TO, 7.08f, 12.69f, -CUBIC_TO, 6.96f, 12.58f, 6.9f, 12.43f, 6.9f, 12.27f, -CUBIC_TO, 6.9f, 12.11f, 6.96f, 11.95f, 7.08f, 11.84f, -LINE_TO, 8.32f, 10.6f, -CLOSE diff --git a/ash/system/palette/stylus_battery_delegate.cc b/ash/system/palette/stylus_battery_delegate.cc index 119e7703f6d09a..52f4360527042d 100644 --- a/ash/system/palette/stylus_battery_delegate.cc +++ b/ash/system/palette/stylus_battery_delegate.cc @@ -6,7 +6,6 @@ #include -#include "ash/constants/ash_features.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shell.h" #include "ash/strings/grit/ash_strings.h" @@ -52,11 +51,7 @@ gfx::ImageSkia StylusBatteryDelegate::GetBatteryImage() const { if (IsBatteryCharging()) { info.icon_badge = &kUnifiedMenuBatteryBoltIcon; - if (features::IsDarkLightModeEnabled()) { - info.badge_outline = &kUnifiedMenuBatteryBoltOutlineMaskIcon; - } else { - info.badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon; - } + info.badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon; } const SkColor icon_fg_color = GetColorForBatteryLevel(); diff --git a/ash/system/phonehub/phone_status_view.cc b/ash/system/phonehub/phone_status_view.cc index f0b4c703575db2..e4e725ad89b204 100644 --- a/ash/system/phonehub/phone_status_view.cc +++ b/ash/system/phonehub/phone_status_view.cc @@ -6,7 +6,6 @@ #include -#include "ash/constants/ash_features.h" #include "ash/public/cpp/network_icon_image_source.h" #include "ash/public/cpp/shelf_config.h" #include "ash/resources/vector_icons/vector_icons.h" @@ -255,11 +254,7 @@ PowerStatus::BatteryImageInfo PhoneStatusView::CalculateBatteryInfo() { if (IsBatterySaverModeOn(phone_status)) { info.icon_badge = &kPhoneHubBatterySaverIcon; - if (features::IsDarkLightModeEnabled()) { - info.badge_outline = &kPhoneHubBatterySaverOutlineMaskIcon; - } else { - info.badge_outline = &kPhoneHubBatterySaverOutlineIcon; - } + info.badge_outline = &kPhoneHubBatterySaverOutlineIcon; return info; } @@ -268,28 +263,16 @@ PowerStatus::BatteryImageInfo PhoneStatusView::CalculateBatteryInfo() { info.alert_if_low = true; if (info.charge_percent < PowerStatus::kCriticalBatteryChargePercentage) { info.icon_badge = &kUnifiedMenuBatteryAlertIcon; - if (features::IsDarkLightModeEnabled()) { - info.badge_outline = &kUnifiedMenuBatteryAlertOutlineMaskIcon; - } else { - info.badge_outline = &kUnifiedMenuBatteryAlertOutlineIcon; - } + info.badge_outline = &kUnifiedMenuBatteryAlertOutlineIcon; } break; case PhoneStatusModel::ChargingState::kChargingAc: info.icon_badge = &kUnifiedMenuBatteryBoltIcon; - if (features::IsDarkLightModeEnabled()) { - info.badge_outline = &kUnifiedMenuBatteryBoltOutlineMaskIcon; - } else { - info.badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon; - } + info.badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon; break; case PhoneStatusModel::ChargingState::kChargingUsb: info.icon_badge = &kUnifiedMenuBatteryUnreliableIcon; - if (features::IsDarkLightModeEnabled()) { - info.badge_outline = &kUnifiedMenuBatteryUnreliableOutlineMaskIcon; - } else { - info.badge_outline = &kUnifiedMenuBatteryUnreliableOutlineIcon; - } + info.badge_outline = &kUnifiedMenuBatteryUnreliableOutlineIcon; break; } diff --git a/ash/system/power/battery_image_source.cc b/ash/system/power/battery_image_source.cc index 59a5179df323c6..f907012605ec37 100644 --- a/ash/system/power/battery_image_source.cc +++ b/ash/system/power/battery_image_source.cc @@ -4,7 +4,6 @@ #include "ash/system/power/battery_image_source.h" -#include "ash/constants/ash_features.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/style/ash_color_provider.h" #include "base/cxx17_backports.h" @@ -100,27 +99,15 @@ void BatteryImageSource::Draw(gfx::Canvas* canvas) { canvas->Restore(); if (info_.badge_outline) { - if (ash::features::IsDarkLightModeEnabled()) { - // The outline is always a vector icon with PATH_MODE_CLEAR. This means it - // masks out anything previously drawn to the canvas. Give it any opaque - // color so it will properly mask the rest of the battery icon. - PaintVectorIcon(canvas, *info_.badge_outline, size().height(), - SK_ColorBLUE); - } else { - // The outline is a colored outline, so give it a color meant to be seen - // by the user. - const SkColor outline_color = - info_.charge_percent > 50 ? fg_color_ : bg_color_; - PaintVectorIcon(canvas, *info_.badge_outline, size().height(), - outline_color); - } + const SkColor outline_color = + info_.charge_percent > 50 ? fg_color_ : bg_color_; + PaintVectorIcon(canvas, *info_.badge_outline, size().height(), + outline_color); } // Paint the badge over top of the battery, if applicable. if (info_.icon_badge) { - const SkColor default_color = - ash::features::IsDarkLightModeEnabled() ? fg_color_ : badge_color_; - const SkColor badge_color = use_alert_color ? alert_color : default_color; + const SkColor badge_color = use_alert_color ? alert_color : badge_color_; PaintVectorIcon(canvas, *info_.icon_badge, size().height(), badge_color); } } diff --git a/ash/system/power/power_status.cc b/ash/system/power/power_status.cc index 5e11b6377eefdb..bffdad81d29212 100644 --- a/ash/system/power/power_status.cc +++ b/ash/system/power/power_status.cc @@ -7,7 +7,6 @@ #include #include -#include "ash/constants/ash_features.h" #include "ash/public/cpp/power_utils.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" @@ -248,29 +247,17 @@ void PowerStatus::CalculateBatteryImageInfo(BatteryImageInfo* info) const { if (!IsUsbChargerConnected() && !IsBatteryPresent()) { info->icon_badge = &kUnifiedMenuBatteryXIcon; - if (features::IsDarkLightModeEnabled()) { - info->badge_outline = &kUnifiedMenuBatteryXOutlineMaskIcon; - } else { - info->badge_outline = &kUnifiedMenuBatteryXOutlineIcon; - } + info->badge_outline = &kUnifiedMenuBatteryXOutlineIcon; info->charge_percent = 0; return; } if (IsUsbChargerConnected()) { info->icon_badge = &kUnifiedMenuBatteryUnreliableIcon; - if (features::IsDarkLightModeEnabled()) { - info->badge_outline = &kUnifiedMenuBatteryUnreliableOutlineMaskIcon; - } else { - info->badge_outline = &kUnifiedMenuBatteryUnreliableOutlineIcon; - } + info->badge_outline = &kUnifiedMenuBatteryUnreliableOutlineIcon; } else if (IsLinePowerConnected()) { info->icon_badge = &kUnifiedMenuBatteryBoltIcon; - if (features::IsDarkLightModeEnabled()) { - info->badge_outline = &kUnifiedMenuBatteryBoltOutlineMaskIcon; - } else { - info->badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon; - } + info->badge_outline = &kUnifiedMenuBatteryBoltOutlineIcon; } else { info->icon_badge = nullptr; info->badge_outline = nullptr; @@ -283,11 +270,7 @@ void PowerStatus::CalculateBatteryImageInfo(BatteryImageInfo* info) const { if (GetBatteryPercent() < kCriticalBatteryChargePercentage && !info->icon_badge) { info->icon_badge = &kUnifiedMenuBatteryAlertIcon; - if (features::IsDarkLightModeEnabled()) { - info->badge_outline = &kUnifiedMenuBatteryAlertOutlineMaskIcon; - } else { - info->badge_outline = &kUnifiedMenuBatteryAlertOutlineIcon; - } + info->badge_outline = &kUnifiedMenuBatteryAlertOutlineIcon; } }