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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 2078393005: mash: Move accessibility_types.h from ui namespace to ash namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a11y
Patch Set: fix chromevox code generated from js Created 4 years, 6 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 | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 78ecd6b9f6416d4270ef0ee96d567ea44884760c..cd8ee4438f5ab640d070b203dfb1691bc4a97d41 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -10,6 +10,7 @@
#include "ash/accelerators/spoken_feedback_toggler.h"
#include "ash/aura/wm_window_aura.h"
#include "ash/common/accessibility_delegate.h"
+#include "ash/common/accessibility_types.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/window_state.h"
@@ -122,7 +123,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
}
void ToggleSpokenFeedback(
- ui::AccessibilityNotificationVisibility notify) override {
+ ash::AccessibilityNotificationVisibility notify) override {
DCHECK(chromeos::AccessibilityManager::Get());
chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(notify);
}
@@ -137,7 +138,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled);
}
- void SetMagnifierType(ui::MagnifierType type) override {
+ void SetMagnifierType(ash::MagnifierType type) override {
DCHECK(chromeos::MagnificationManager::Get());
return chromeos::MagnificationManager::Get()->SetMagnifierType(type);
}
@@ -147,7 +148,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
return chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
}
- ui::MagnifierType GetMagnifierType() const override {
+ ash::MagnifierType GetMagnifierType() const override {
DCHECK(chromeos::MagnificationManager::Get());
return chromeos::MagnificationManager::Get()->GetMagnifierType();
}
@@ -270,29 +271,29 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
return std::numeric_limits<double>::min();
}
- void TriggerAccessibilityAlert(ui::AccessibilityAlert alert) override {
+ void TriggerAccessibilityAlert(ash::AccessibilityAlert alert) override {
Profile* profile = ProfileManager::GetActiveUserProfile();
if (profile) {
switch (alert) {
- case ui::A11Y_ALERT_WINDOW_NEEDED: {
+ case ash::A11Y_ALERT_WINDOW_NEEDED: {
AutomationManagerAura::GetInstance()->HandleAlert(
profile, l10n_util::GetStringUTF8(IDS_A11Y_ALERT_WINDOW_NEEDED));
break;
}
- case ui::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED: {
+ case ash::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED: {
AutomationManagerAura::GetInstance()->HandleAlert(
profile, l10n_util::GetStringUTF8(
IDS_A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED));
break;
}
- case ui::A11Y_ALERT_NONE:
+ case ash::A11Y_ALERT_NONE:
break;
}
}
}
- ui::AccessibilityAlert GetLastAccessibilityAlert() override {
- return ui::A11Y_ALERT_NONE;
+ ash::AccessibilityAlert GetLastAccessibilityAlert() override {
+ return ash::A11Y_ALERT_NONE;
}
void PlayEarcon(int sound_key) override {
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698