Remove unused code in DesktopScreenPositionClient

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/aura/window_tree_host.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/screen.h"
@@ skipping 57 matching lines @@
   ConvertPointToScreen(root_window, point);
 }
 
 void DesktopScreenPositionClient::SetBounds(
     aura::Window* window,
     const gfx::Rect& bounds,
     const gfx::Display& display) {
   // TODO: 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);
+  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 = GetOrigin(root);
     origin.Offset(-host_origin.x(), -host_origin.y());
     window->SetBounds(gfx::Rect(origin, bounds.size()));
     return;
   }
 
-  internal::NativeWidgetPrivate* desktop_native_widget =
-      DesktopNativeWidgetAura::ForWindow(root);
-  if (desktop_native_widget &&
-      desktop_native_widget->GetNativeView() == window) {
-    // |window| is the content_window.
-    // Setting bounds of root resizes |window|.
-    root->GetHost()->SetBounds(bounds);
-  } else {
-    window->SetBounds(bounds);
-  }
+  window->SetBounds(bounds);
 }
 
 }  // namespace views