MacViews a11y: Sync VoiceOver cursor with keyboard focus.

ui/views/view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 1303 matching lines @@
 }
 
 // static
 bool View::ExceededDragThreshold(const gfx::Vector2d& delta) {
   return (abs(delta.x()) > GetHorizontalDragThreshold() ||
           abs(delta.y()) > GetVerticalDragThreshold());
 }
 
 // Accessibility----------------------------------------------------------------
 
-gfx::NativeViewAccessible View::GetNativeViewAccessible() {
+NativeViewAccessibility* View::GetNativeViewAccessibility() {
   if (!native_view_accessibility_)
     native_view_accessibility_ = NativeViewAccessibility::Create(this);
-  if (native_view_accessibility_)
-    return native_view_accessibility_->GetNativeObject();
-  return NULL;
+  return native_view_accessibility_;
+}
+
+gfx::NativeViewAccessible View::GetNativeViewAccessible() {
+  if (GetNativeViewAccessibility())
+    return GetNativeViewAccessibility()->GetNativeObject();
+  return nullptr;
 }
 
 void View::NotifyAccessibilityEvent(
     ui::AXEvent event_type,
     bool send_native_event) {
   if (ViewsDelegate::GetInstance())
     ViewsDelegate::GetInstance()->NotifyAccessibilityEvent(this, event_type);
 
   if (send_native_event && GetWidget()) {
-    if (!native_view_accessibility_)
-      native_view_accessibility_ = NativeViewAccessibility::Create(this);
-    if (native_view_accessibility_)
-      native_view_accessibility_->NotifyAccessibilityEvent(event_type);
+    if (GetNativeViewAccessibility())
+      GetNativeViewAccessibility()->NotifyAccessibilityEvent(event_type);
   }
 }
 
 // Scrolling -------------------------------------------------------------------
 
 void View::ScrollRectToVisible(const gfx::Rect& rect) {
   // We must take RTL UI mirroring into account when adjusting the position of
   // the region.
   if (parent_) {
     gfx::Rect scroll_rect(rect);
@@ skipping 1067 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views