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

Side by Side Diff: ui/views/accessibility/ax_widget_obj_wrapper.cc

Issue 2008773002: Begin using ChromeVox Next to read tab and window titles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix a bunch of tests. Created 4 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/views/accessibility/ax_widget_obj_wrapper.h" 5 #include "ui/views/accessibility/ax_widget_obj_wrapper.h"
6 6
7 #include "base/strings/utf_string_conversions.h"
7 #include "ui/accessibility/ax_node_data.h" 8 #include "ui/accessibility/ax_node_data.h"
8 #include "ui/views/accessibility/ax_aura_obj_cache.h" 9 #include "ui/views/accessibility/ax_aura_obj_cache.h"
9 #include "ui/views/accessibility/ax_aura_obj_wrapper.h" 10 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
10 #include "ui/views/widget/widget.h" 11 #include "ui/views/widget/widget.h"
12 #include "ui/views/widget/widget_delegate.h"
11 13
12 namespace views { 14 namespace views {
13 15
14 AXWidgetObjWrapper::AXWidgetObjWrapper(Widget* widget) : widget_(widget) { 16 AXWidgetObjWrapper::AXWidgetObjWrapper(Widget* widget) : widget_(widget) {
15 widget->AddObserver(this); 17 widget->AddObserver(this);
16 widget->AddRemovalsObserver(this); 18 widget->AddRemovalsObserver(this);
17 } 19 }
18 20
19 AXWidgetObjWrapper::~AXWidgetObjWrapper() { 21 AXWidgetObjWrapper::~AXWidgetObjWrapper() {
20 if (!AXAuraObjCache::GetInstance()->is_destroying()) { 22 if (!AXAuraObjCache::GetInstance()->is_destroying()) {
(...skipping 11 matching lines...) Expand all
32 std::vector<AXAuraObjWrapper*>* out_children) { 34 std::vector<AXAuraObjWrapper*>* out_children) {
33 if (!widget_->IsVisible() || !widget_->GetRootView()->visible()) 35 if (!widget_->IsVisible() || !widget_->GetRootView()->visible())
34 return; 36 return;
35 37
36 out_children->push_back( 38 out_children->push_back(
37 AXAuraObjCache::GetInstance()->GetOrCreate(widget_->GetRootView())); 39 AXAuraObjCache::GetInstance()->GetOrCreate(widget_->GetRootView()));
38 } 40 }
39 41
40 void AXWidgetObjWrapper::Serialize(ui::AXNodeData* out_node_data) { 42 void AXWidgetObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
41 out_node_data->id = GetID(); 43 out_node_data->id = GetID();
42 out_node_data->role = ui::AX_ROLE_CLIENT; 44 out_node_data->role = widget_->widget_delegate()->GetAccessibleWindowRole();
45 out_node_data->AddStringAttribute(
46 ui::AX_ATTR_NAME,
47 base::UTF16ToUTF8(
48 widget_->widget_delegate()->GetAccessibleWindowTitle()));
43 out_node_data->location = widget_->GetWindowBoundsInScreen(); 49 out_node_data->location = widget_->GetWindowBoundsInScreen();
44 // TODO(dtseng): Set better states.
45 out_node_data->state = 0; 50 out_node_data->state = 0;
46 } 51 }
47 52
48 int32_t AXWidgetObjWrapper::GetID() { 53 int32_t AXWidgetObjWrapper::GetID() {
49 return AXAuraObjCache::GetInstance()->GetID(widget_); 54 return AXAuraObjCache::GetInstance()->GetID(widget_);
50 } 55 }
51 56
52 void AXWidgetObjWrapper::OnWidgetDestroying(Widget* widget) { 57 void AXWidgetObjWrapper::OnWidgetDestroying(Widget* widget) {
53 AXAuraObjCache::GetInstance()->Remove(widget); 58 AXAuraObjCache::GetInstance()->Remove(widget);
54 } 59 }
55 60
56 void AXWidgetObjWrapper::OnWillRemoveView(Widget* widget, View* view) { 61 void AXWidgetObjWrapper::OnWillRemoveView(Widget* widget, View* view) {
57 AXAuraObjCache::GetInstance()->RemoveViewSubtree(view); 62 AXAuraObjCache::GetInstance()->RemoveViewSubtree(view);
58 } 63 }
59 64
60 } // namespace views 65 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698