Revert 244005 "Remove SetHostSize/Bounds from RootWindow in favo..."

trunk/src/ui/aura/root_window.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/aura/root_window.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 176 matching lines @@
     held_repostable_event_.reset();
     // TODO(rbyers): Reposing of gestures is tricky to get
     // right, so it's not yet supported.  crbug.com/170987.
   }
 }
 
 WindowTreeHostDelegate* RootWindow::AsWindowTreeHostDelegate() {
   return this;
 }
 
+void RootWindow::SetHostSize(const gfx::Size& size_in_pixel) {
+  DispatchDetails details = DispatchHeldEvents();
+  if (details.dispatcher_destroyed)
+    return;
+  gfx::Rect bounds = host_->GetBounds();
+  bounds.set_size(size_in_pixel);
+  host_->SetBounds(bounds);
+
+  // Requery the location to constrain it within the new root window size.
+  gfx::Point point;
+  if (host_->QueryMouseLocation(&point)) {
+    SetLastMouseLocation(window(),
+                         ui::ConvertPointToDIP(window()->layer(), point));
+  }
+
+  synthesize_mouse_move_ = false;
+}
+
+void RootWindow::SetHostBounds(const gfx::Rect& bounds_in_pixel) {
+  DCHECK(!bounds_in_pixel.IsEmpty());
+  DispatchDetails details = DispatchHeldEvents();
+  if (details.dispatcher_destroyed)
+    return;
+  host_->SetBounds(bounds_in_pixel);
+  synthesize_mouse_move_ = false;
+}
+
 void RootWindow::SetCursor(gfx::NativeCursor cursor) {
   last_cursor_ = cursor;
   // A lot of code seems to depend on NULL cursors actually showing an arrow,
   // so just pass everything along to the host.
   host_->SetCursor(cursor);
 }
 
 void RootWindow::OnCursorVisibilityChanged(bool show) {
   // Clear any existing mouse hover effects when the cursor becomes invisible.
   // Note we do not need to dispatch a mouse enter when the cursor becomes
@@ skipping 499 matching lines @@
 
 void RootWindow::OnHostResized(const gfx::Size& size) {
   TRACE_EVENT1("ui", "RootWindow::OnHostResized",
                "size", size.ToString());
 
   DispatchDetails details = DispatchHeldEvents();
   if (details.dispatcher_destroyed)
     return;
   FOR_EACH_OBSERVER(RootWindowObserver, observers_,
                     OnWindowTreeHostResized(this));
-
-  // Constrain the mouse position within the new root Window size.
-  gfx::Point point;
-  if (host_->QueryMouseLocation(&point)) {
-    SetLastMouseLocation(window(),
-                         ui::ConvertPointToDIP(window()->layer(), point));
-  }
-  synthesize_mouse_move_ = false;
 }
 
 RootWindow* RootWindow::AsRootWindow() {
   return this;
 }
 
 const RootWindow* RootWindow::AsRootWindow() const {
   return this;
 }
 
@@ skipping 254 matching lines @@
       break;
 
     default:
       NOTREACHED();
       break;
   }
   PreDispatchLocatedEvent(target, event);
 }
 
 }  // namespace aura