| Index: ui/views/accessibility/native_view_accessibility_base.h
|
| diff --git a/ui/views/accessibility/native_view_accessibility.h b/ui/views/accessibility/native_view_accessibility_base.h
|
| similarity index 66%
|
| copy from ui/views/accessibility/native_view_accessibility.h
|
| copy to ui/views/accessibility/native_view_accessibility_base.h
|
| index ec1e0dbe626e0f256b985e9d75acd184515b5687..6606a105a62eb28fc55212631a245a39c38508e3 100644
|
| --- a/ui/views/accessibility/native_view_accessibility.h
|
| +++ b/ui/views/accessibility/native_view_accessibility_base.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_
|
| -#define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_
|
| +#ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_BASE_H_
|
| +#define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_BASE_H_
|
|
|
| #include <memory>
|
|
|
| @@ -14,41 +14,27 @@
|
| #include "ui/accessibility/platform/ax_platform_node.h"
|
| #include "ui/accessibility/platform/ax_platform_node_delegate.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| +#include "ui/views/accessibility/native_view_accessibility.h"
|
| #include "ui/views/views_export.h"
|
| #include "ui/views/widget/widget_observer.h"
|
|
|
| -// Set PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL if this platform has a
|
| -// specific implementation of NativeViewAccessibility::Create().
|
| -#undef PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL
|
| -
|
| -#if defined(OS_WIN)
|
| -#define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
|
| -#endif
|
| -
|
| -#if defined(OS_MACOSX)
|
| -#define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
|
| -#endif
|
| -
|
| -#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS)
|
| -#define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
|
| -#endif
|
| -
|
| namespace views {
|
|
|
| class View;
|
| class Widget;
|
|
|
| -class VIEWS_EXPORT NativeViewAccessibility
|
| - : public ui::AXPlatformNodeDelegate,
|
| +// Shared base class for platforms that require an implementation of
|
| +// NativeViewAccessibility to interface with the native accessibility toolkit.
|
| +class VIEWS_EXPORT NativeViewAccessibilityBase
|
| + : public NativeViewAccessibility,
|
| + public ui::AXPlatformNodeDelegate,
|
| public WidgetObserver {
|
| public:
|
| - static std::unique_ptr<NativeViewAccessibility> Create(View* view);
|
| -
|
| - ~NativeViewAccessibility() override;
|
| -
|
| - gfx::NativeViewAccessible GetNativeObject();
|
| + ~NativeViewAccessibilityBase() override;
|
|
|
| - void NotifyAccessibilityEvent(ui::AXEvent event_type);
|
| + // NativeViewAccessibility:
|
| + gfx::NativeViewAccessible GetNativeObject() override;
|
| + void NotifyAccessibilityEvent(ui::AXEvent event_type) override;
|
|
|
| // Focuses or unfocuses a View.
|
| bool SetFocused(bool focused);
|
| @@ -73,7 +59,7 @@ class VIEWS_EXPORT NativeViewAccessibility
|
| void SetParentWidget(Widget* parent_widget);
|
|
|
| protected:
|
| - explicit NativeViewAccessibility(View* view);
|
| + explicit NativeViewAccessibilityBase(View* view);
|
|
|
| // Weak. Owns this.
|
| View* view_;
|
| @@ -92,9 +78,9 @@ class VIEWS_EXPORT NativeViewAccessibility
|
|
|
| ui::AXNodeData data_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibility);
|
| + DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityBase);
|
| };
|
|
|
| } // namespace views
|
|
|
| -#endif // UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_
|
| +#endif // UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_BASE_H_
|
|
|