Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/native_view_accessibility_auralinux.h" | 5 #include "ui/views/accessibility/native_view_accessibility_auralinux.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <memory> | |
| 8 #include <vector> | 9 #include <vector> |
| 9 | 10 |
| 10 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/ptr_util.h" | |
| 11 #include "base/memory/singleton.h" | 13 #include "base/memory/singleton.h" |
| 12 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
| 13 #include "ui/accessibility/ax_action_data.h" | 15 #include "ui/accessibility/ax_action_data.h" |
| 14 #include "ui/accessibility/ax_enums.h" | 16 #include "ui/accessibility/ax_enums.h" |
| 15 #include "ui/accessibility/ax_node_data.h" | 17 #include "ui/accessibility/ax_node_data.h" |
| 16 #include "ui/accessibility/platform/ax_platform_node_auralinux.h" | 18 #include "ui/accessibility/platform/ax_platform_node_auralinux.h" |
| 17 #include "ui/accessibility/platform/ax_platform_node_delegate.h" | 19 #include "ui/accessibility/platform/ax_platform_node_delegate.h" |
| 18 #include "ui/gfx/native_widget_types.h" | 20 #include "ui/gfx/native_widget_types.h" |
| 19 #include "ui/views/views_delegate.h" | 21 #include "ui/views/views_delegate.h" |
| 20 #include "ui/views/widget/widget.h" | 22 #include "ui/views/widget/widget.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 | 144 |
| 143 ui::AXPlatformNode* platform_node_; | 145 ui::AXPlatformNode* platform_node_; |
| 144 ui::AXNodeData data_; | 146 ui::AXNodeData data_; |
| 145 std::vector<Widget*> widgets_; | 147 std::vector<Widget*> widgets_; |
| 146 | 148 |
| 147 DISALLOW_COPY_AND_ASSIGN(AuraLinuxApplication); | 149 DISALLOW_COPY_AND_ASSIGN(AuraLinuxApplication); |
| 148 }; | 150 }; |
| 149 | 151 |
| 150 } // namespace | 152 } // namespace |
| 151 | 153 |
| 152 // static | 154 gfx::NativeViewAccessible NativeViewAccessibilityAuraLinux::GetParent() { |
| 153 NativeViewAccessibility* NativeViewAccessibility::Create(View* view) { | 155 gfx::NativeViewAccessible parent = NativeViewAccessibility::GetParent(); |
| 154 AuraLinuxApplication::GetInstance()->RegisterWidget(view->GetWidget()); | 156 if (!parent) |
| 155 return new NativeViewAccessibilityAuraLinux(view); | 157 parent = AuraLinuxApplication::GetInstance()->GetNativeViewAccessible(); |
| 158 return parent; | |
| 156 } | 159 } |
| 157 | 160 |
| 158 NativeViewAccessibilityAuraLinux::NativeViewAccessibilityAuraLinux(View* view) | 161 NativeViewAccessibilityAuraLinux::NativeViewAccessibilityAuraLinux(View* view) |
| 159 : NativeViewAccessibility(view) { | 162 : NativeViewAccessibility(view) { |
| 160 } | 163 } |
| 161 | 164 |
| 162 NativeViewAccessibilityAuraLinux::~NativeViewAccessibilityAuraLinux() { | 165 NativeViewAccessibilityAuraLinux::~NativeViewAccessibilityAuraLinux() { |
| 163 } | 166 } |
| 164 | 167 |
| 165 gfx::NativeViewAccessible NativeViewAccessibilityAuraLinux::GetParent() { | 168 // static |
| 166 gfx::NativeViewAccessible parent = NativeViewAccessibility::GetParent(); | 169 std::unique_ptr<NativeViewAccessibility> NativeViewAccessibility::Create( |
| 167 if (!parent) | 170 View* view) { |
| 168 parent = AuraLinuxApplication::GetInstance()->GetNativeViewAccessible(); | 171 AuraLinuxApplication::GetInstance()->RegisterWidget(view->GetWidget()); |
| 169 return parent; | 172 return base::MakeUnique<NativeViewAccessibilityAuraLinux>(view); |
|
tapted
2017/02/28 06:29:12
huhhh .. I guess we can't declare NativeViewAccess
Patti Lor
2017/02/28 22:24:24
Acknowledged.
| |
| 170 } | 173 } |
| 171 | 174 |
| 172 } // namespace views | 175 } // namespace views |
| OLD | NEW |