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

chrome/browser/gtk/browser_window_gtk.cc

 // Copyright (c) 2009 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 "chrome/browser/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/base_paths_linux.h"
 #include "base/command_line.h"
 #include "base/gfx/gtk_util.h"
+#include "base/gfx/rect.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
+#include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_item_model.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/status_bubble_gtk.h"
 #include "chrome/browser/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/gtk/task_manager_gtk.h"
 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "chrome/browser/window_sizer.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/views/panel_controller.h"
 #include "chrome/browser/views/tabs/tab_overview_types.h"
@@ skipping 1231 matching lines @@
       g_browser_process->local_state()->GetMutableDictionary(
           window_name.c_str());
   // Note that we store left/top for consistency with Windows, but that we
   // *don't* obey them; we only use them for computing width/height.  See
   // comments in SetGeometryHints().
   window_preferences->SetInteger(L"left", restored_bounds_.x());
   window_preferences->SetInteger(L"top", restored_bounds_.y());
   window_preferences->SetInteger(L"right", restored_bounds_.right());
   window_preferences->SetInteger(L"bottom", restored_bounds_.bottom());
   window_preferences->SetBoolean(L"maximized", IsMaximized());
+
+  scoped_ptr<WindowSizer::MonitorInfoProvider> monitor_info_provider(
+      WindowSizer::CreateDefaultMonitorInfoProvider());
+  gfx::Rect work_area(
+      monitor_info_provider->GetMonitorWorkAreaMatching(restored_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());
 }
 
 // static
 gboolean BrowserWindowGtk::OnGtkAccelerator(GtkAccelGroup* accel_group,
                                             GObject* acceleratable,
                                             guint keyval,
                                             GdkModifierType modifier,
                                             BrowserWindowGtk* browser_window) {
   int command_id = GetCommandId(keyval, modifier);
   browser_window->ExecuteBrowserCommand(command_id);
@@ skipping 214 matching lines @@
       *edge = GDK_WINDOW_EDGE_NORTH_EAST;
     } else if (y < bounds_.height() - kResizeAreaCornerSize) {
       *edge = GDK_WINDOW_EDGE_EAST;
     } else {
       *edge = GDK_WINDOW_EDGE_SOUTH_EAST;
     }
     return true;
   }
   NOTREACHED();
 }