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

chrome/browser/ui/panels/display_settings_provider.cc

Index: chrome/browser/ui/panels/display_settings_provider.cc
diff --git a/chrome/browser/ui/panels/display_settings_provider.cc b/chrome/browser/ui/panels/display_settings_provider.cc
index a6652a11256409b55a764ddbc633d2c648ecb28a..87897ef0fadb50c2eaa3c7002c2d726ca2aa47df 100644
--- a/chrome/browser/ui/panels/display_settings_provider.cc
+++ b/chrome/browser/ui/panels/display_settings_provider.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/panels/display_settings_provider.h"
 
 #include "base/logging.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 
 DisplaySettingsProvider::DisplaySettingsProvider(Observer* observer)
@@ -19,9 +20,9 @@ gfx::Rect DisplaySettingsProvider::GetWorkArea() {
 #if defined(OS_MACOSX)
   // On OSX, panels should be dropped all the way to the bottom edge of the
   // screen (and overlap Dock).
-  gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorBounds();
+  gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor()->GetBounds();
 #else
-  gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea();
+  gfx::Rect work_area = gfx::Screen::GetPrimaryMonitor()->GetWorkArea();
 #endif
 
   if (work_area_ != work_area) {