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

chrome/browser/views/chrome_views_delegate.cc

Index: chrome/browser/views/chrome_views_delegate.cc
===================================================================
--- chrome/browser/views/chrome_views_delegate.cc	(revision 22807)
+++ chrome/browser/views/chrome_views_delegate.cc	(working copy)
@@ -6,8 +6,10 @@
 
 #include "base/clipboard.h"
 #include "base/gfx/rect.h"
+#include "base/scoped_ptr.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/window_sizer.h"
 #include "chrome/common/pref_service.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -31,6 +33,15 @@
   window_preferences->SetInteger(L"right", bounds.right());
   window_preferences->SetInteger(L"bottom", bounds.bottom());
   window_preferences->SetBoolean(L"maximized", maximized);
+
+  scoped_ptr<WindowSizer::MonitorInfoProvider> monitor_info_provider(
+      WindowSizer::CreateDefaultMonitorInfoProvider());
+  gfx::Rect work_area(
+      monitor_info_provider->GetMonitorWorkAreaMatching(bounds));
+  window_preferences->SetInteger(L"work_area_left", work_area.x());
+  window_preferences->SetInteger(L"work_area_top", work_area.y());
+  window_preferences->SetInteger(L"work_area_right", work_area.right());
+  window_preferences->SetInteger(L"work_area_bottom", work_area.bottom());
 }
 
 bool ChromeViewsDelegate::GetSavedWindowBounds(const std::wstring& window_name,
Property changes on: chrome\browser\views\chrome_views_delegate.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/views/chrome_views_delegate.cc:r69-2775
   Merged /trunk/src/chrome/browser/views/chrome_views_delegate.cc:r21946
Added: svn:eol-style
   + LF