Correctly update the popup window position

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index e706f46a2b53a5112360434c5047eca0906df6ac..56a4e36a0d9c2f56108cec61180c034e9990b67d 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -592,6 +592,10 @@ void RenderWidgetHostViewAura::Hide() {
 #endif
 }
 
+aura::Window* RenderWidgetHostViewAura::GetToplevelWindow() {
+  return window_->GetToplevelWindow();
+}
+
 void RenderWidgetHostViewAura::SetSize(const gfx::Size& size) {
   // For a SetSize operation, we don't care what coordinate system the origin
   // of the window is in, it's only important to make sure that the origin
@@ -600,21 +604,12 @@ void RenderWidgetHostViewAura::SetSize(const gfx::Size& size) {
 }
 
 void RenderWidgetHostViewAura::SetBounds(const gfx::Rect& rect) {
-  gfx::Point relative_origin(rect.origin());
-
-  // RenderWidgetHostViewAura::SetBounds() takes screen coordinates, but
-  // Window::SetBounds() takes parent coordinates, so do the conversion here.
-  aura::Window* root = window_->GetRootWindow();
-  if (root) {
-    aura::client::ScreenPositionClient* screen_position_client =
-        aura::client::GetScreenPositionClient(root);
-    if (screen_position_client) {
-      screen_position_client->ConvertPointFromScreen(
-          window_->parent(), &relative_origin);
-    }
-  }
-
-  InternalSetBounds(gfx::Rect(relative_origin, rect.size()));
+  display::Display display =
+      popup_parent_host_view_
+          ? display::Screen::GetScreen()->GetDisplayNearestWindow(
+                popup_parent_host_view_->window_)
+          : display::Screen::GetScreen()->GetDisplayMatching(rect);
+  GetToplevelWindow()->SetBoundsInScreen(rect, display);
 }
 
 gfx::Vector2dF RenderWidgetHostViewAura::GetLastScrollOffset() const {