Move DisplayUtils methods into gfx::Screen.

ui/gfx/screen_aura.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 "ui/gfx/screen.h"
 
 #include "base/logging.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
@@ skipping 40 matching lines @@
   DCHECK(instance_);
   return instance_->GetMonitorAreaNearestPointImpl(point);
 }
 
 // static
 gfx::NativeWindow Screen::GetWindowAtCursorScreenPoint() {
   DCHECK(instance_);
   return instance_->GetWindowAtCursorScreenPointImpl();
 }
 
+// static
+gfx::Size Screen::GetPrimaryMonitorSize() {
+  DCHECK(instance_);

[James Cook, 2011/10/24 23:40:54]

nit: Do we really need all these DCHECK's?

[Daniel Erat, 2011/10/25 00:32:48]

Agreed and removed.

+  return instance_->GetPrimaryMonitorSizeImpl();
+}
+
+// static
+int Screen::GetNumMonitors() {
+  DCHECK(instance_);
+  return instance_->GetNumMonitorsImpl();
+}
+
 }  // namespace gfx