Fixes bug where windows weren't being moved and resized if the desktop

ui/aura_shell/workspace/workspace.cc

 // Copyright (c) 2011 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/aura_shell/workspace/workspace.h"
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/window.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 
 namespace {
 // Horizontal margin between windows.
 const int kWindowHorizontalMargin = 10;
 
 // Maximum number of windows a workspace can have.
 size_t g_max_windows_per_workspace = 2;
 }
 
 namespace aura_shell {
+namespace internal {
 
 Workspace::Workspace(WorkspaceManager* manager)
     : workspace_manager_(manager) {
   workspace_manager_->AddWorkspace(this);
 }
 
 Workspace::~Workspace() {
   workspace_manager_->RemoveWorkspace(this);
 }
 
@@ skipping 171 matching lines @@
 void Workspace::MoveWindowTo(
     aura::Window* window,
     const gfx::Point& origin,
     bool animate) {
   if (window->show_state() == ui::SHOW_STATE_FULLSCREEN)
     window->Fullscreen();
   else if (window->show_state() == ui::SHOW_STATE_MAXIMIZED)
     window->Maximize();
   else {
     gfx::Rect bounds = window->GetTargetBounds();
-    bounds.set_origin(origin);
+    gfx::Rect work_area = GetWorkAreaBounds();
+    // Make sure the window isn't bigger than the workspace size.
+    bounds.SetRect(origin.x(), origin.y(),
+                   std::min(work_area.width(), bounds.width()),
+                   std::min(work_area.height(), bounds.height()));
     if (animate) {
       ui::LayerAnimator::ScopedSettings settings(
           window->layer()->GetAnimator());
       window->SetBounds(bounds);
     } else {
       window->SetBounds(bounds);
     }
   }
 }
 
@@ skipping 10 matching lines @@
   return total_width;
 }
 
 // static
 size_t Workspace::SetMaxWindowsCount(size_t max) {
   int old = g_max_windows_per_workspace;
   g_max_windows_per_workspace = max;
   return old;
 }
 
+}  // namespace internal
 }  // namespace aura_shell