Merge 21946 - Move window to workarea origin if it is completely offscreen....

chrome/browser/window_sizer.h

Index: chrome/browser/window_sizer.h
===================================================================
--- chrome/browser/window_sizer.h	(revision 22807)
+++ chrome/browser/window_sizer.h	(working copy)
@@ -88,7 +88,8 @@
     // Retrieve the persisted bounds of the window. Returns true if there was
     // persisted data to retrieve state information, false otherwise.
     virtual bool GetPersistentState(gfx::Rect* bounds,
-                                    bool* maximized) const = 0;
+                                    bool* maximized,
+                                    gfx::Rect* work_area) const = 0;
 
     // Retrieve the bounds of the most recent window of the matching type.
     // Returns true if there was a last active window to retrieve state
@@ -162,8 +163,13 @@
   // monitor containing |other_bounds|.  Despite the name, this doesn't
   // guarantee the bounds are fully contained within this monitor's work rect;
   // it just tried to ensure the edges are visible on _some_ work rect.
+  // If |saved_work_area| is non-empty, it is used to determine whether the
+  // monitor cofiguration has changed. If it has, bounds are repositioned and
+  // resized if necessary to make them completely contained in the current work
+  // area.
   void AdjustBoundsToBeVisibleOnMonitorContaining(
       const gfx::Rect& other_bounds,
+      const gfx::Rect& saved_work_area,
       gfx::Rect* bounds) const;
 
   // Providers for persistent storage and monitor metrics.
Property changes on: chrome\browser\window_sizer.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/chrome/browser/window_sizer.h:r21946
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/window_sizer.h:r69-2775