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

chrome/browser/ui/views/chrome_views_delegate.cc

Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index bf99c47f35199fb20a4fc6f24c5c9a1b3352d902..b7e5a80dd7850da1567145dca372c00c7edfe5de 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/clipboard/clipboard.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/native_widget.h"
@@ -72,8 +73,9 @@ void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
   window_preferences->SetInteger("bottom", bounds.bottom());
   window_preferences->SetBoolean("maximized",
                                  show_state == ui::SHOW_STATE_MAXIMIZED);
-
-  gfx::Rect work_area(gfx::Screen::GetMonitorWorkAreaMatching(bounds));
+  gfx::Monitor monitor;
+  gfx::Screen::GetMonitorMatching(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());