Chromium Code Reviews| Index: chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h |
| diff --git a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h |
| index ad4abbd6de288d9799682095e7acc1f9f4291808..ba480f1f8ba5ddc072db7c125136db55d1fa2282 100644 |
| --- a/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h |
| +++ b/chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h |
| @@ -8,11 +8,13 @@ |
| #include "components/arc/arc_service.h" |
| #include "components/arc/common/accessibility_helper.mojom.h" |
| #include "components/arc/instance_holder.h" |
| +#include "components/exo/wm_helper.h" |
| #include "mojo/public/cpp/bindings/binding.h" |
| namespace arc { |
| class ArcBridgeService; |
| +class AXTreeSourceArc; |
| // ArcAccessibilityHelperBridge is an instance to receive converted Android |
| // accessibility events and info via mojo interface and dispatch them to chrome |
| @@ -20,7 +22,8 @@ class ArcBridgeService; |
| class ArcAccessibilityHelperBridge |
| : public ArcService, |
| public mojom::AccessibilityHelperHost, |
| - public InstanceHolder<mojom::AccessibilityHelperInstance>::Observer { |
| + public InstanceHolder<mojom::AccessibilityHelperInstance>::Observer, |
| + public exo::WMHelper::ActivationObserver { |
| public: |
| explicit ArcAccessibilityHelperBridge(ArcBridgeService* bridge_service); |
| ~ArcAccessibilityHelperBridge() override; |
| @@ -30,12 +33,17 @@ class ArcAccessibilityHelperBridge |
| // mojom::AccessibilityHelperHost overrides. |
| void OnAccessibilityEvent( |
| - mojom::AccessibilityEventType event_type, |
| - mojom::AccessibilityNodeInfoDataPtr event_source) override; |
| + mojom::AccessibilityEventDataPtr event_data) override; |
| private: |
| + // exo::WMHelper::ActivationObserver overrides. |
| + void OnWindowActivated(aura::Window* gained_active, |
| + aura::Window* lost_active) override; |
| + |
| mojo::Binding<mojom::AccessibilityHelperHost> binding_; |
| + std::unique_ptr<AXTreeSourceArc> tree_; |
|
dmazzoni
2017/02/09 01:18:09
Maybe tree_source_?
|
| + |
| DISALLOW_COPY_AND_ASSIGN(ArcAccessibilityHelperBridge); |
| }; |