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

chrome/browser/ui/panels/display_settings_provider.cc

 // Copyright (c) 2012 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/ui/panels/display_settings_provider.h"
 
 #include "base/logging.h"
+#include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 
 DisplaySettingsProvider::DisplaySettingsProvider()
     : display_area_observer_(NULL),
       desktop_bar_observer_(NULL) {
 }
 
 DisplaySettingsProvider::~DisplaySettingsProvider() {
 }
 
 gfx::Rect DisplaySettingsProvider::GetDisplayArea() {
   // Do the first-time initialization if not yet.
   if (adjusted_work_area_.IsEmpty())
     OnDisplaySettingsChanged();
 
   return adjusted_work_area_;
 }
 
 gfx::Rect DisplaySettingsProvider::GetWorkArea() const {
 #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
   return work_area;
 }
 
 void DisplaySettingsProvider::OnDisplaySettingsChanged() {
   gfx::Rect work_area = GetWorkArea();
   if (work_area == work_area_)
     return;
   work_area_ = work_area;
 
@@ skipping 43 matching lines @@
     adjusted_work_area_.set_width(adjusted_work_area_.width() - space);
   }
 }
 
 #if defined(USE_AURA)
 // static
 DisplaySettingsProvider* DisplaySettingsProvider::Create() {
   return new DisplaySettingsProvider();
 }
 #endif