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

ui/views/accessibility/native_view_accessibility_win.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.
 
 #include "ui/views/accessibility/native_view_accessibility_win.h"
 
 #include <oleacc.h>
 
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/ax_text_utils.h"
+#include "ui/base/layout.h"
 #include "ui/base/win/accessibility_misc_utils.h"
 #include "ui/base/win/atl_module.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/win/hwnd_util.h"
 
 namespace views {
 
@@ skipping 24 matching lines @@
     return parent;
 
   return NULL;
 }
 
 gfx::AcceleratedWidget
 NativeViewAccessibilityWin::GetTargetForNativeAccessibilityEvent() {
   return HWNDForView(view_);
 }
 
+gfx::RectF NativeViewAccessibilityWin::GetBoundsInScreen() const {
+  gfx::RectF bounds = gfx::RectF(view_->GetBoundsInScreen());
+  gfx::NativeView native_view = view_->GetWidget()->GetNativeView();
+  float device_scale = ui::GetScaleFactorForNativeView(native_view);
+  bounds.Scale(device_scale);
+  return bounds;
+}
+
 }  // namespace views