Refactor screen/monitor so that gfx::Screen returns monitor object.

chrome/browser/ui/gtk/browser_window_gtk.cc

Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 1f29cc6fe1f20769310597299549deb4485cb8aa..76d1fd5e797fc11600bee9b6ab621c56172fc66f 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -103,6 +103,7 @@
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/skia_utils_gtk.h"
@@ -2102,8 +2103,9 @@ void BrowserWindowGtk::SaveWindowPosition() {
   window_preferences->SetInteger("bottom", restored_bounds_.bottom());
   window_preferences->SetBoolean("maximized", IsMaximized());
 
-  gfx::Rect work_area(
-      gfx::Screen::GetMonitorWorkAreaMatching(restored_bounds_));
+  gfx::Monitor monitor;
+  gfx::Screen::GetMonitorMatching(restored_bounds_, &monitor);
+  const gfx::Rect& work_area = monitor.work_area();
   window_preferences->SetInteger("work_area_left", work_area.x());
   window_preferences->SetInteger("work_area_top", work_area.y());
   window_preferences->SetInteger("work_area_right", work_area.right());