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

Unified Diff: ash/common/system/tray_accessibility.cc

Issue 2365523002: Materialized the font/icon color for some default rows in the system menu. (Closed)
Patch Set: Applied TrayPopupItemStyle to Network, SMS, Tracing, OS Update. Created 4 years, 3 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/tray_accessibility.cc
diff --git a/ash/common/system/tray_accessibility.cc b/ash/common/system/tray_accessibility.cc
index 273a93937a0aff907e732b51e109e1b83d867279..23faaaba941b8fbab8d88ee0e2d4b197facb912c 100644
--- a/ash/common/system/tray_accessibility.cc
+++ b/ash/common/system/tray_accessibility.cc
@@ -15,6 +15,7 @@
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray/tray_details_view.h"
#include "ash/common/system/tray/tray_item_more.h"
+#include "ash/common/system/tray/tray_popup_item_style.h"
#include "ash/common/system/tray/tray_popup_label_button.h"
#include "ash/common/wm_shell.h"
#include "ash/resources/vector_icons/vector_icons.h"
@@ -77,10 +78,8 @@ class DefaultAccessibilityView : public TrayItemMore {
explicit DefaultAccessibilityView(SystemTrayItem* owner)
: TrayItemMore(owner, true) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
- SetImage(
- gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon, kMenuIconColor));
- } else {
+ if (!MaterialDesignController::UseMaterialDesignSystemIcons()) {
+ // The icon doesn't change in non-md.
SetImage(*bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK)
.ToImageSkia());
}
@@ -93,6 +92,24 @@ class DefaultAccessibilityView : public TrayItemMore {
~DefaultAccessibilityView() override {}
+ protected:
+ // TrayItemMore:
+ std::unique_ptr<TrayPopupItemStyle> CreateStyle() const override {
+ return base::MakeUnique<TrayPopupItemStyle>(
+ GetNativeTheme(), TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
+ }
+
+ void UpdateStyle() override {
+ TrayItemMore::UpdateStyle();
+
+ if (!MaterialDesignController::IsSystemTrayMenuMaterial())
+ return;
+
+ std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
+ SetImage(gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon,
+ style->GetForegroundColor()));
+ }
+
private:
DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView);
};

Powered by Google App Engine
This is Rietveld 408576698