Accessible bounds should include device scale factor on Windows (again)

ui/views/accessibility/native_view_accessibility_base.cc

 // Copyright (c) 2013 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.
 
 #include "ui/views/accessibility/native_view_accessibility_base.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/native_widget_types.h"
@@ skipping 44 matching lines @@
 
   // Views may misbehave if their widget is closed; return an unknown role
   // rather than possibly crashing.
   if (!view_->GetWidget() || view_->GetWidget()->IsClosed()) {
     data_.role = ui::AX_ROLE_UNKNOWN;
     data_.state = 1 << ui::AX_STATE_DISABLED;
     return data_;
   }
 
   view_->GetAccessibleNodeData(&data_);
-  data_.location = gfx::RectF(view_->GetBoundsInScreen());
+  data_.location = GetBoundsInScreen();
   base::string16 description;
   view_->GetTooltipText(gfx::Point(), &description);
   data_.AddStringAttribute(ui::AX_ATTR_DESCRIPTION,
                            base::UTF16ToUTF8(description));
 
   if (view_->IsAccessibilityFocusable())
     data_.state |= (1 << ui::AX_STATE_FOCUSABLE);
 
   if (!view_->enabled())
     data_.state |= (1 << ui::AX_STATE_DISABLED);
@@ skipping 142 matching lines @@
   }
 }
 
 void NativeViewAccessibilityBase::SetParentWidget(Widget* parent_widget) {
   if (parent_widget_)
     parent_widget_->RemoveObserver(this);
   parent_widget_ = parent_widget;
   parent_widget_->AddObserver(this);
 }
 
+gfx::RectF NativeViewAccessibilityBase::GetBoundsInScreen() const {
+  return gfx::RectF(view_->GetBoundsInScreen());
+}
+
 void NativeViewAccessibilityBase::PopulateChildWidgetVector(
     std::vector<Widget*>* result_child_widgets) {
   // Only attach child widgets to the root view.
   Widget* widget = view_->GetWidget();
   // Note that during window close, a Widget may exist in a state where it has
   // no NativeView, but hasn't yet torn down its view hierarchy.
   if (!widget || !widget->GetNativeView() || widget->GetRootView() != view_)
     return;
 
   std::set<Widget*> child_widgets;
@@ skipping 18 matching lines @@
               child_widget_platform_node->GetDelegate());
       if (child_widget_view_accessibility->parent_widget() != widget)
         child_widget_view_accessibility->SetParentWidget(widget);
     }
 
     result_child_widgets->push_back(child_widget);
   }
 }
 
 }  // namespace views