Browse Source

Update API to isAccessibilitySupportEnabled

Kevin Sawicki 8 years ago
parent
commit
34f7ddec9f

+ 5 - 4
atom/browser/api/atom_api_app.cc

@@ -282,8 +282,8 @@ void App::OnFinishLaunching() {
   Emit("ready");
 }
 
-void App::OnAccessibilityChanged() {
-  Emit("accessibility-changed", IsAccessible());
+void App::OnAccessibilitySupportChanged() {
+  Emit("accessibility-support-changed", IsAccessibilitySupportEnabled());
 }
 
 #if defined(OS_MACOSX)
@@ -491,7 +491,7 @@ void App::DisableHardwareAcceleration(mate::Arguments* args) {
   content::GpuDataManager::GetInstance()->DisableHardwareAcceleration();
 }
 
-bool App::IsAccessible() {
+bool App::IsAccessibilitySupportEnabled() {
   auto ax_state = content::BrowserAccessibilityState::GetInstance();
   return ax_state->IsAccessibleBrowser();
 }
@@ -588,7 +588,8 @@ void App::BuildPrototype(
       .SetMethod("makeSingleInstance", &App::MakeSingleInstance)
       .SetMethod("releaseSingleInstance", &App::ReleaseSingleInstance)
       .SetMethod("relaunch", &App::Relaunch)
-      .SetMethod("isAccessible", &App::IsAccessible)
+      .SetMethod("IsAccessibilitySupportEnabled",
+                 &App::IsAccessibilitySupportEnabled)
       .SetMethod("disableHardwareAcceleration",
                  &App::DisableHardwareAcceleration);
 }

+ 2 - 2
atom/browser/api/atom_api_app.h

@@ -72,7 +72,7 @@ class App : public AtomBrowserClient::Delegate,
   void OnFinishLaunching() override;
   void OnLogin(LoginHandler* login_handler,
                const base::DictionaryValue& request_details) override;
-  void OnAccessibilityChanged() override;
+  void OnAccessibilitySupportChanged() override;
 #if defined(OS_MACOSX)
   void OnContinueUserActivity(
       bool* prevent_default,
@@ -114,7 +114,7 @@ class App : public AtomBrowserClient::Delegate,
   void ReleaseSingleInstance();
   bool Relaunch(mate::Arguments* args);
   void DisableHardwareAcceleration(mate::Arguments* args);
-  bool IsAccessible();
+  bool IsAccessibilitySupportEnabled();
 #if defined(USE_NSS_CERTS)
   void ImportCertificate(const base::DictionaryValue& options,
                          const net::CompletionCallback& callback);

+ 4 - 2
atom/browser/browser.cc

@@ -155,8 +155,10 @@ void Browser::DidFinishLaunching() {
   FOR_EACH_OBSERVER(BrowserObserver, observers_, OnFinishLaunching());
 }
 
-void Browser::OnAccessibilityChanged() {
-  FOR_EACH_OBSERVER(BrowserObserver, observers_, OnAccessibilityChanged());
+void Browser::OnAccessibilitySupportChanged() {
+  FOR_EACH_OBSERVER(BrowserObserver,
+                    observers_,
+                    OnAccessibilitySupportChanged());
 }
 
 void Browser::RequestLogin(

+ 1 - 1
atom/browser/browser.h

@@ -185,7 +185,7 @@ class Browser : public WindowListObserver {
   void WillFinishLaunching();
   void DidFinishLaunching();
 
-  void OnAccessibilityChanged();
+  void OnAccessibilitySupportChanged();
 
   // Request basic auth login.
   void RequestLogin(LoginHandler* login_handler,

+ 2 - 2
atom/browser/browser_observer.h

@@ -52,8 +52,8 @@ class BrowserObserver {
   virtual void OnLogin(LoginHandler* login_handler,
                        const base::DictionaryValue& request_details) {}
 
-  // The browser's accessibility state has changed.
-  virtual void OnAccessibilityChanged() {};
+  // The browser's accessibility suppport has changed.
+  virtual void OnAccessibilitySupportChanged() {};
 
 #if defined(OS_MACOSX)
   // The browser wants to resume a user activity via handoff. (macOS only)

+ 1 - 1
atom/browser/mac/atom_application.mm

@@ -84,7 +84,7 @@
     ax_state->DisableAccessibility();
   }
 
-  atom::Browser::Get()->OnAccessibilityChanged();
+  atom::Browser::Get()->OnAccessibilitySupportChanged();
 }
 
 @end

+ 1 - 1
atom/browser/native_window_views_win.cc

@@ -99,7 +99,7 @@ bool NativeWindowViews::PreHandleMSG(
         if (axState && !axState->IsAccessibleBrowser()) {
           axState->OnScreenReaderDetected();
           enabled_a11y_support_ = true;
-          Browser::Get()->OnAccessibilityChanged();
+          Browser::Get()->OnAccessibilitySupportChanged();
         }
       }