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

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

Issue 2700653002: [Ash MD] Remove pre-MD code from TrayImageItem and subclasses (Closed)
Patch Set: comments Created 3 years, 10 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
« no previous file with comments | « ash/common/system/tray/tray_image_item.cc ('k') | ash/common/system/update/tray_update.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray_accessibility.cc
diff --git a/ash/common/system/tray_accessibility.cc b/ash/common/system/tray_accessibility.cc
index dbd2df66bd4c993a586be2dca6043f26d838d525..74344d9017987d0cd84d40d900119ceb587ee0cf 100644
--- a/ash/common/system/tray_accessibility.cc
+++ b/ash/common/system/tray_accessibility.cc
@@ -86,14 +86,8 @@ class DefaultAccessibilityView : public TrayItemMore {
public:
explicit DefaultAccessibilityView(SystemTrayItem* owner)
: TrayItemMore(owner, true) {
- ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- if (!MaterialDesignController::UseMaterialDesignSystemIcons()) {
- // The icon doesn't change in non-md.
- SetImage(*bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK)
- .ToImageSkia());
- }
base::string16 label =
- bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_ACCESSIBILITY);
+ l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBILITY);
SetLabel(label);
SetAccessibleName(label);
set_id(test::kAccessibilityTrayItemViewId);
@@ -105,10 +99,6 @@ class DefaultAccessibilityView : public TrayItemMore {
// TrayItemMore:
void UpdateStyle() override {
TrayItemMore::UpdateStyle();
-
- if (!UseMdMenu())
- return;
-
std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
SetImage(gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon,
style->GetIconColor()));
@@ -350,7 +340,7 @@ void AccessibilityDetailedView::ShowHelp() {
TrayAccessibility::TrayAccessibility(SystemTray* system_tray)
: TrayImageItem(system_tray,
- IDR_AURA_UBER_TRAY_ACCESSIBILITY,
+ kSystemTrayAccessibilityIcon,
UMA_ACCESSIBILITY),
default_(NULL),
detailed_popup_(NULL),
« no previous file with comments | « ash/common/system/tray/tray_image_item.cc ('k') | ash/common/system/update/tray_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698