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

Side by Side Diff: ash/common/system/tray_accessibility.cc

Issue 2496963004: [ash-md] Fixed the effective text/icon colors in the system menu. (Closed)
Patch Set: Fixed compile error (typo). Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/system/tray_accessibility.h" 5 #include "ash/common/system/tray_accessibility.h"
6 6
7 #include "ash/common/accessibility_delegate.h" 7 #include "ash/common/accessibility_delegate.h"
8 #include "ash/common/accessibility_types.h" 8 #include "ash/common/accessibility_types.h"
9 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/common/session/session_state_delegate.h" 10 #include "ash/common/session/session_state_delegate.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 protected: 104 protected:
105 // TrayItemMore: 105 // TrayItemMore:
106 void UpdateStyle() override { 106 void UpdateStyle() override {
107 TrayItemMore::UpdateStyle(); 107 TrayItemMore::UpdateStyle();
108 108
109 if (!UseMdMenu()) 109 if (!UseMdMenu())
110 return; 110 return;
111 111
112 std::unique_ptr<TrayPopupItemStyle> style = CreateStyle(); 112 std::unique_ptr<TrayPopupItemStyle> style = CreateStyle();
113 SetImage(gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon, 113 SetImage(gfx::CreateVectorIcon(kSystemMenuAccessibilityIcon,
114 style->GetForegroundColor())); 114 style->GetIconColor()));
115 } 115 }
116 116
117 private: 117 private:
118 DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView); 118 DISALLOW_COPY_AND_ASSIGN(DefaultAccessibilityView);
119 }; 119 };
120 120
121 //////////////////////////////////////////////////////////////////////////////// 121 ////////////////////////////////////////////////////////////////////////////////
122 // ash::tray::AccessibilityPopupView 122 // ash::tray::AccessibilityPopupView
123 123
124 AccessibilityPopupView::AccessibilityPopupView(SystemTrayItem* owner, 124 AccessibilityPopupView::AccessibilityPopupView(SystemTrayItem* owner,
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 if (detailed_popup_) 477 if (detailed_popup_)
478 detailed_popup_->GetWidget()->Close(); 478 detailed_popup_->GetWidget()->Close();
479 if (detailed_menu_) 479 if (detailed_menu_)
480 detailed_menu_->GetWidget()->Close(); 480 detailed_menu_->GetWidget()->Close();
481 } 481 }
482 482
483 previous_accessibility_state_ = accessibility_state; 483 previous_accessibility_state_ = accessibility_state;
484 } 484 }
485 485
486 } // namespace ash 486 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_popup_item_style.cc ('k') | ash/system/chromeos/rotation/tray_rotation_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698