Revert 215772 "Don't assume that widgets of TYPE_CONTROL are par..."

trunk/src/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/root_window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/screen.h"
@@ skipping 50 matching lines @@
 void DesktopScreenPositionClient::ConvertHostPointToScreen(
     aura::RootWindow* window, gfx::Point* point) {
   ConvertPointToScreen(window, point);
 }
 
 void DesktopScreenPositionClient::SetBounds(
     aura::Window* window,
     const gfx::Rect& bounds,
     const gfx::Display& display) {
   // TODO: Use the 3rd parameter, |display|.
+  gfx::Point origin = bounds.origin();
   aura::RootWindow* root = window->GetRootWindow();
+  aura::Window::ConvertPointToTarget(window->parent(), root, &origin);
+
+  if (window->type() == aura::client::WINDOW_TYPE_CONTROL) {
+    window->SetBounds(gfx::Rect(origin, bounds.size()));
+    return;
+  }
 
   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;
   }
 
   DesktopNativeWidgetAura* desktop_native_widget =
       DesktopNativeWidgetAura::ForWindow(window);
   if (desktop_native_widget) {
     root->SetHostBounds(bounds);
     // Setting bounds of root resizes |window|.
   } else {
     window->SetBounds(bounds);
   }
 }
 
 }  // namespace views