Revert 240542 "Make sure the dragged window is smaller than work..."

trunk/src/ash/root_window_controller.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 "ash/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 33 matching lines @@
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/tooltip_client.h"
-#include "ui/aura/client/window_types.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/keyboard/keyboard_controller.h"
@@ skipping 26 matching lines @@
   aura::Window* container = new aura::Window(NULL);
   container->set_id(window_id);
   container->SetName(name);
   container->Init(ui::LAYER_NOT_DRAWN);
   parent->AddChild(container);
   if (window_id != internal::kShellWindowId_UnparentedControlContainer)
     container->Show();
   return container;
 }
 
-float ToRelativeValue(int value, int src, int dst) {
-  return static_cast<float>(value) / static_cast<float>(src) * dst;
-}
-
-void MoveOriginRelativeToSize(const gfx::Size& src_size,
-                                const gfx::Size& dst_size,
-                                gfx::Rect* bounds_in_out) {
-  gfx::Point origin = bounds_in_out->origin();
-  bounds_in_out->set_origin(gfx::Point(
-      ToRelativeValue(origin.x(), src_size.width(), dst_size.width()),
-      ToRelativeValue(origin.y(), src_size.height(), dst_size.height())));
-}
-
 // Reparents |window| to |new_parent|.
 void ReparentWindow(aura::Window* window, aura::Window* new_parent) {
-  const gfx::Size src_size = window->parent()->bounds().size();
-  const gfx::Size dst_size = new_parent->bounds().size();
   // Update the restore bounds to make it relative to the display.
   wm::WindowState* state = wm::GetWindowState(window);
   gfx::Rect restore_bounds;
   bool has_restore_bounds = state->HasRestoreBounds();
-
-  // TODO(oshima): snapped state should be handled by the layout manager.
-  bool update_bounds = state->IsNormalShowState() || state->IsMinimized();
-  gfx::Rect local_bounds;
-  if (update_bounds) {
-    local_bounds = state->window()->bounds();
-    MoveOriginRelativeToSize(src_size, dst_size, &local_bounds);
-  }
-
-  if (has_restore_bounds) {
+  if (has_restore_bounds)
     restore_bounds = state->GetRestoreBoundsInParent();
-    MoveOriginRelativeToSize(src_size, dst_size, &restore_bounds);
-  }
-
   new_parent->AddChild(window);
-
-  if (update_bounds)
-    window->SetBounds(local_bounds);
-
   if (has_restore_bounds)
     state->SetRestoreBoundsInParent(restore_bounds);
 }
 
 // Reparents the appropriate set of windows from |src| to |dst|.
 void ReparentAllWindows(aura::Window* src, aura::Window* dst) {
   // Set of windows to move.
   const int kContainerIdsToMove[] = {
     internal::kShellWindowId_DefaultContainer,
     internal::kShellWindowId_DockedContainer,
@@ skipping 824 matching lines @@
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace internal
 }  // namespace ash