Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / default_accessibility_delegate.cc

diff --git a/src/ash/default_accessibility_delegate.cc b/src/ash/default_accessibility_delegate.cc
index bfc6b50..f337a2e 100644 (file)
--- a/src/ash/default_accessibility_delegate.cc
+++ b/src/ash/default_accessibility_delegate.cc
@@ -7,15 +7,16 @@
 #include <limits>
 
 namespace ash {
-namespace internal {
 
 DefaultAccessibilityDelegate::DefaultAccessibilityDelegate()
     : spoken_feedback_enabled_(false),
       high_contrast_enabled_(false),
       screen_magnifier_enabled_(false),
-      screen_magnifier_type_(kDefaultMagnifierType),
+      screen_magnifier_type_(ui::kDefaultMagnifierType),
       large_cursor_enabled_(false),
-      autoclick_enabled_(false) {
+      autoclick_enabled_(false),
+      virtual_keyboard_enabled_(false),
+      accessibility_alert_(ui::A11Y_ALERT_NONE) {
 }
 
 DefaultAccessibilityDelegate::~DefaultAccessibilityDelegate() {}
@@ -36,7 +37,7 @@ void DefaultAccessibilityDelegate::SetMagnifierEnabled(bool enabled) {
   screen_magnifier_enabled_ = enabled;
 }
 
-void DefaultAccessibilityDelegate::SetMagnifierType(MagnifierType type) {
+void DefaultAccessibilityDelegate::SetMagnifierType(ui::MagnifierType type) {
   screen_magnifier_type_ = type;
 }
 
@@ -44,7 +45,7 @@ bool DefaultAccessibilityDelegate::IsMagnifierEnabled() const {
   return screen_magnifier_enabled_;
 }
 
-MagnifierType DefaultAccessibilityDelegate::GetMagnifierType() const {
+ui::MagnifierType DefaultAccessibilityDelegate::GetMagnifierType() const {
   return screen_magnifier_type_;
 }
 
@@ -64,7 +65,24 @@ bool DefaultAccessibilityDelegate::IsAutoclickEnabled() const {
   return autoclick_enabled_;
 }
 
-bool DefaultAccessibilityDelegate::ShouldAlwaysShowAccessibilityMenu() const {
+void DefaultAccessibilityDelegate::SetVirtualKeyboardEnabled(bool enabled) {
+  virtual_keyboard_enabled_ = enabled;
+}
+
+bool DefaultAccessibilityDelegate::IsVirtualKeyboardEnabled() const {
+  return virtual_keyboard_enabled_;
+}
+
+bool DefaultAccessibilityDelegate::ShouldShowAccessibilityMenu() const {
+  return spoken_feedback_enabled_ ||
+         high_contrast_enabled_ ||
+         screen_magnifier_enabled_ ||
+         large_cursor_enabled_ ||
+         autoclick_enabled_ ||
+         virtual_keyboard_enabled_;
+}
+
+bool DefaultAccessibilityDelegate::IsBrailleDisplayConnected() const {
   return false;
 }
 
@@ -72,7 +90,7 @@ void DefaultAccessibilityDelegate::SilenceSpokenFeedback() const {
 }
 
 void DefaultAccessibilityDelegate::ToggleSpokenFeedback(
-    AccessibilityNotificationVisibility notify) {
+    ui::AccessibilityNotificationVisibility notify) {
   spoken_feedback_enabled_ = !spoken_feedback_enabled_;
 }
 
@@ -83,5 +101,21 @@ double DefaultAccessibilityDelegate::GetSavedScreenMagnifierScale() {
   return std::numeric_limits<double>::min();
 }
 
-}  // namespace internal
+void DefaultAccessibilityDelegate::TriggerAccessibilityAlert(
+    ui::AccessibilityAlert alert) {
+  accessibility_alert_ = alert;
+}
+
+ui::AccessibilityAlert
+DefaultAccessibilityDelegate::GetLastAccessibilityAlert() {
+  return accessibility_alert_;
+}
+
+void DefaultAccessibilityDelegate::PlayEarcon(int sound_key) {
+}
+
+base::TimeDelta DefaultAccessibilityDelegate::PlayShutdownSound() const {
+  return base::TimeDelta();
+}
+
 }  // namespace ash