Extract MonitorInfoProvider from WindowSizer.

chrome/browser/ui/panels/panel_manager.cc

 // Copyright (c) 2011 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/panel_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/panels/panel_overflow_strip.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
-#include "chrome/browser/ui/window_sizer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "ui/gfx/screen.h"
 
 namespace {
 const int kOverflowStripThickness = 24;
 
 // Width of spacing around panel strip and the left/right edges of the screen.
 const int kPanelStripLeftMargin = kOverflowStripThickness + 6;
 const int kPanelStripRightMargin = 24;
 
 // Height of panel strip is based on the factor of the working area.
 const double kPanelStripHeightFactor = 0.5;
@@ skipping 15 matching lines @@
   panel_strip_.reset(new PanelStrip(this));
   panel_overflow_strip_.reset(new PanelOverflowStrip(this));
   auto_hiding_desktop_bar_ = AutoHidingDesktopBar::Create(this);
   OnDisplayChanged();
 }
 
 PanelManager::~PanelManager() {
 }
 
 void PanelManager::OnDisplayChanged() {
-  scoped_ptr<WindowSizer::MonitorInfoProvider> info_provider(
-      WindowSizer::CreateDefaultMonitorInfoProvider());
 #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 = info_provider->GetPrimaryMonitorBounds();
+  gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorBounds();
 #else
-  gfx::Rect work_area = info_provider->GetPrimaryMonitorWorkArea();
+  gfx::Rect work_area = gfx::Screen::GetPrimaryMonitorWorkArea();
 #endif
   SetWorkArea(work_area);
 }
 
 void PanelManager::SetWorkArea(const gfx::Rect& work_area) {
   if (work_area == work_area_)
     return;
   work_area_ = work_area;
 
   auto_hiding_desktop_bar_->UpdateWorkArea(work_area_);
@@ skipping 153 matching lines @@
   return panel_strip_->num_panels() + panel_overflow_strip_->num_panels();
 }
 
 bool PanelManager::is_dragging_panel() const {
   return panel_strip_->is_dragging_panel();
 }
 
 const PanelManager::Panels& PanelManager::panels() const {
   return panel_strip_->panels();
 }