Revert of Correctly update the popup window position (patchset #6 id:160001 of https://codereview.c…

ui/views/widget/desktop_aura/desktop_screen_position_client.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/widget/desktop_aura/desktop_screen_position_client.h"
 
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 namespace views {
 
@@ skipping 20 matching lines @@
 DesktopScreenPositionClient::~DesktopScreenPositionClient() {
   aura::client::SetScreenPositionClient(root_window_, NULL);
 }
 
 void DesktopScreenPositionClient::SetBounds(aura::Window* window,
                                             const gfx::Rect& bounds,
                                             const display::Display& display) {
   // TODO(jam): Use the 3rd parameter, |display|.
   aura::Window* root = window->GetRootWindow();
 
+  // This method assumes that |window| does not have an associated
+  // DesktopNativeWidgetAura.
   internal::NativeWidgetPrivate* desktop_native_widget =
       DesktopNativeWidgetAura::ForWindow(root);
-  // The screen bounds request to the content_window_ should be interpreted as
-  // a widget bounds change.
-  if (desktop_native_widget &&
-      desktop_native_widget->GetNativeView() == window) {
-    desktop_native_widget->GetWidget()->SetBounds(bounds);
-    return;
-  }
-  // The following logic assumes that |window| does not have an associated
-  // DesktopNativeWidgetAura.
   DCHECK(!desktop_native_widget ||
          desktop_native_widget->GetNativeView() != window);
 
   if (PositionWindowInScreenCoordinates(window)) {
     // The caller expects windows we consider "embedded" to be placed in the
     // screen coordinate system. So we need to offset the root window's
     // position (which is in screen coordinates) from these bounds.
 
     gfx::Point origin = bounds.origin();
     aura::Window::ConvertPointToTarget(window->parent(), root, &origin);
 
     gfx::Point host_origin = GetOriginInScreen(root);
     origin.Offset(-host_origin.x(), -host_origin.y());
     window->SetBounds(gfx::Rect(origin, bounds.size()));
     return;
   }
 
   window->SetBounds(bounds);
 }
 
 }  // namespace views