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

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

Issue 2154523002: Move AccessibilityDelegate ownership to ash::WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setmediadelegate
Patch Set: fix mash_unittests Created 4 years, 5 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/system_tray_unittest.cc ('k') | ash/common/wm/overview/window_selector.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 b4074f16ca888536c4c8e5165bd54d955fdc6b62..14c8d70792ef83af22babbff68d374d673e968e4 100644
--- a/ash/common/system/tray_accessibility.cc
+++ b/ash/common/system/tray_accessibility.cc
@@ -45,7 +45,7 @@ enum AccessibilityState {
};
uint32_t GetAccessibilityState() {
- AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
+ AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
uint32_t state = A11Y_NONE;
if (delegate->IsSpokenFeedbackEnabled())
state |= A11Y_SPOKEN_FEEDBACK;
@@ -163,7 +163,7 @@ void AccessibilityDetailedView::AppendAccessibilityList() {
CreateScrollableList();
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
+ AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
spoken_feedback_enabled_ = delegate->IsSpokenFeedbackEnabled();
spoken_feedback_view_ =
AddScrollListItem(bundle.GetLocalizedString(
@@ -247,7 +247,7 @@ HoverHighlightView* AccessibilityDetailedView::AddScrollListItem(
}
void AccessibilityDetailedView::OnViewClicked(views::View* sender) {
- AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
+ AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
if (sender == footer()->content()) {
TransitionToDefaultView();
} else if (sender == spoken_feedback_view_) {
@@ -344,7 +344,7 @@ views::View* TrayAccessibility::CreateDefaultView(LoginStatus status) {
// - "Enable accessibility menu" on chrome://settings is checked;
// - or any of accessibility features is enabled
// Otherwise, not shows it.
- AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();
+ AccessibilityDelegate* delegate = WmShell::Get()->accessibility_delegate();
if (login_ != LoginStatus::NOT_LOGGED_IN &&
!delegate->ShouldShowAccessibilityMenu() &&
// On login screen, keeps the initial visibility of the menu.
« no previous file with comments | « ash/common/system/tray/system_tray_unittest.cc ('k') | ash/common/wm/overview/window_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698