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

Side by Side Diff: content/browser/accessibility/browser_accessibility_manager.cc

Issue 892513004: Revert of Suppress accessibility events when user is navigating away. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/accessibility/browser_accessibility_manager.h" 5 #include "content/browser/accessibility/browser_accessibility_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/accessibility/browser_accessibility.h" 8 #include "content/browser/accessibility/browser_accessibility.h"
9 #include "content/common/accessibility_messages.h" 9 #include "content/common/accessibility_messages.h"
10 #include "ui/accessibility/ax_tree_serializer.h" 10 #include "ui/accessibility/ax_tree_serializer.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } 72 }
73 #endif 73 #endif
74 74
75 BrowserAccessibilityManager::BrowserAccessibilityManager( 75 BrowserAccessibilityManager::BrowserAccessibilityManager(
76 BrowserAccessibilityDelegate* delegate, 76 BrowserAccessibilityDelegate* delegate,
77 BrowserAccessibilityFactory* factory) 77 BrowserAccessibilityFactory* factory)
78 : delegate_(delegate), 78 : delegate_(delegate),
79 factory_(factory), 79 factory_(factory),
80 tree_(new ui::AXSerializableTree()), 80 tree_(new ui::AXSerializableTree()),
81 focus_(NULL), 81 focus_(NULL),
82 user_is_navigating_away_(false),
83 osk_state_(OSK_ALLOWED) { 82 osk_state_(OSK_ALLOWED) {
84 tree_->SetDelegate(this); 83 tree_->SetDelegate(this);
85 } 84 }
86 85
87 BrowserAccessibilityManager::BrowserAccessibilityManager( 86 BrowserAccessibilityManager::BrowserAccessibilityManager(
88 const ui::AXTreeUpdate& initial_tree, 87 const ui::AXTreeUpdate& initial_tree,
89 BrowserAccessibilityDelegate* delegate, 88 BrowserAccessibilityDelegate* delegate,
90 BrowserAccessibilityFactory* factory) 89 BrowserAccessibilityFactory* factory)
91 : delegate_(delegate), 90 : delegate_(delegate),
92 factory_(factory), 91 factory_(factory),
93 tree_(new ui::AXSerializableTree()), 92 tree_(new ui::AXSerializableTree()),
94 focus_(NULL), 93 focus_(NULL),
95 user_is_navigating_away_(false),
96 osk_state_(OSK_ALLOWED) { 94 osk_state_(OSK_ALLOWED) {
97 tree_->SetDelegate(this); 95 tree_->SetDelegate(this);
98 Initialize(initial_tree); 96 Initialize(initial_tree);
99 } 97 }
100 98
101 BrowserAccessibilityManager::~BrowserAccessibilityManager() { 99 BrowserAccessibilityManager::~BrowserAccessibilityManager() {
102 tree_.reset(NULL); 100 tree_.reset(NULL);
103 } 101 }
104 102
105 void BrowserAccessibilityManager::Initialize( 103 void BrowserAccessibilityManager::Initialize(
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 void BrowserAccessibilityManager::OnWindowFocused() { 145 void BrowserAccessibilityManager::OnWindowFocused() {
148 if (focus_) 146 if (focus_)
149 NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, GetFromAXNode(focus_)); 147 NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, GetFromAXNode(focus_));
150 } 148 }
151 149
152 void BrowserAccessibilityManager::OnWindowBlurred() { 150 void BrowserAccessibilityManager::OnWindowBlurred() {
153 if (focus_) 151 if (focus_)
154 NotifyAccessibilityEvent(ui::AX_EVENT_BLUR, GetFromAXNode(focus_)); 152 NotifyAccessibilityEvent(ui::AX_EVENT_BLUR, GetFromAXNode(focus_));
155 } 153 }
156 154
157 void BrowserAccessibilityManager::UserIsNavigatingAway() {
158 user_is_navigating_away_ = true;
159 }
160
161 void BrowserAccessibilityManager::UserIsReloading() {
162 user_is_navigating_away_ = true;
163 }
164
165 void BrowserAccessibilityManager::NavigationSucceeded() {
166 user_is_navigating_away_ = false;
167 }
168
169 void BrowserAccessibilityManager::NavigationFailed() {
170 user_is_navigating_away_ = false;
171 }
172
173 void BrowserAccessibilityManager::GotMouseDown() { 155 void BrowserAccessibilityManager::GotMouseDown() {
174 osk_state_ = OSK_ALLOWED_WITHIN_FOCUSED_OBJECT; 156 osk_state_ = OSK_ALLOWED_WITHIN_FOCUSED_OBJECT;
175 NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, GetFromAXNode(focus_)); 157 NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, GetFromAXNode(focus_));
176 } 158 }
177 159
178 bool BrowserAccessibilityManager::UseRootScrollOffsetsWhenComputingBounds() { 160 bool BrowserAccessibilityManager::UseRootScrollOffsetsWhenComputingBounds() {
179 return true; 161 return true;
180 } 162 }
181 163
182 void BrowserAccessibilityManager::OnAccessibilityEvents( 164 void BrowserAccessibilityManager::OnAccessibilityEvents(
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 ui::AXTreeUpdate BrowserAccessibilityManager::SnapshotAXTreeForTesting() { 451 ui::AXTreeUpdate BrowserAccessibilityManager::SnapshotAXTreeForTesting() {
470 scoped_ptr<ui::AXTreeSource<const ui::AXNode*> > tree_source( 452 scoped_ptr<ui::AXTreeSource<const ui::AXNode*> > tree_source(
471 tree_->CreateTreeSource()); 453 tree_->CreateTreeSource());
472 ui::AXTreeSerializer<const ui::AXNode*> serializer(tree_source.get()); 454 ui::AXTreeSerializer<const ui::AXNode*> serializer(tree_source.get());
473 ui::AXTreeUpdate update; 455 ui::AXTreeUpdate update;
474 serializer.SerializeChanges(tree_->GetRoot(), &update); 456 serializer.SerializeChanges(tree_->GetRoot(), &update);
475 return update; 457 return update;
476 } 458 }
477 459
478 } // namespace content 460 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698