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

Side by Side Diff: chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.cc

Issue 2640123004: Initial support for native accessibility in ARC (Closed)
Patch Set: Experimental changes Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bri dge.h" 5 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bri dge.h"
6 6
7 #include "base/command_line.h"
7 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 8 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
9 #include "chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.h"
10 #include "chromeos/chromeos_switches.h"
8 #include "components/arc/arc_bridge_service.h" 11 #include "components/arc/arc_bridge_service.h"
9 #include "components/exo/wm_helper.h" 12 #include "components/exo/wm_helper.h"
10 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
11 #include "ui/gfx/geometry/rect.h" 14 #include "ui/gfx/geometry/rect.h"
12 15
13 namespace arc { 16 namespace arc {
14 17
15 ArcAccessibilityHelperBridge::ArcAccessibilityHelperBridge( 18 ArcAccessibilityHelperBridge::ArcAccessibilityHelperBridge(
16 ArcBridgeService* bridge_service) 19 ArcBridgeService* bridge_service)
17 : ArcService(bridge_service), binding_(this) { 20 : ArcService(bridge_service), binding_(this) {
18 arc_bridge_service()->accessibility_helper()->AddObserver(this); 21 arc_bridge_service()->accessibility_helper()->AddObserver(this);
22
23 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
24 chromeos::switches::kEnableChromeVoxArcSupport))
25 tree_.reset(new AXTreeSourceArc());
19 } 26 }
20 27
21 ArcAccessibilityHelperBridge::~ArcAccessibilityHelperBridge() { 28 ArcAccessibilityHelperBridge::~ArcAccessibilityHelperBridge() {
22 arc_bridge_service()->accessibility_helper()->RemoveObserver(this); 29 arc_bridge_service()->accessibility_helper()->RemoveObserver(this);
23 } 30 }
24 31
25 void ArcAccessibilityHelperBridge::OnInstanceReady() { 32 void ArcAccessibilityHelperBridge::OnInstanceReady() {
26 auto* instance = ARC_GET_INSTANCE_FOR_METHOD( 33 auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
27 arc_bridge_service()->accessibility_helper(), Init); 34 arc_bridge_service()->accessibility_helper(), Init);
28 DCHECK(instance); 35 DCHECK(instance);
29 instance->Init(binding_.CreateInterfacePtrAndBind()); 36 instance->Init(binding_.CreateInterfacePtrAndBind());
30 } 37 }
31 38
32 void ArcAccessibilityHelperBridge::OnAccessibilityEvent( 39 void ArcAccessibilityHelperBridge::OnAccessibilityEvent(
33 mojom::AccessibilityEventType event_type, 40 mojom::AccessibilityEventDataPtr event_data) {
34 mojom::AccessibilityNodeInfoDataPtr event_source) { 41 if (tree_)
35 if (event_type != mojom::AccessibilityEventType::VIEW_FOCUSED || 42 tree_->NotifyAccessibilityEvent(event_data.get());
36 event_source.is_null()) {
37 return;
38 }
39
40 chromeos::AccessibilityManager* accessibility_manager =
41 chromeos::AccessibilityManager::Get();
42
43 if (!accessibility_manager ||
44 !accessibility_manager->IsFocusHighlightEnabled()) {
45 return;
46 }
47
48 exo::WMHelper* wmHelper = exo::WMHelper::GetInstance();
49
50 aura::Window* focused_window = wmHelper->GetFocusedWindow();
51 if (!focused_window)
52 return;
53
54 aura::Window* toplevel_window = focused_window->GetToplevelWindow();
55
56 gfx::Rect bounds_in_screen = gfx::ScaleToEnclosingRect(
57 event_source.get()->boundsInScreen,
58 1.0f / toplevel_window->layer()->device_scale_factor());
59
60 accessibility_manager->OnViewFocusedInArc(bounds_in_screen);
61 } 43 }
62 44
63 } // namespace arc 45 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698