Add DeviceDisplayInfo getter in WindowAndroid.

ui/gfx/screen_android.cc

Index: ui/gfx/screen_android.cc
diff --git a/ui/gfx/screen_android.cc b/ui/gfx/screen_android.cc
index 41099f18b99eeaa768a69d63435cd63d9188e012..7a1effa0e8cef6d6c2446727089443ea77689768 100644
--- a/ui/gfx/screen_android.cc
+++ b/ui/gfx/screen_android.cc
@@ -5,83 +5,12 @@
 #include "ui/gfx/screen.h"
 
 #include "base/logging.h"
-#include "base/macros.h"
-#include "ui/gfx/android/device_display_info.h"
-#include "ui/gfx/display.h"
-#include "ui/gfx/geometry/size_conversions.h"
 
 namespace gfx {
 
-class ScreenAndroid : public Screen {
- public:
-  ScreenAndroid() {}
-
-  gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
-
-  gfx::NativeWindow GetWindowUnderCursor() override {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
-
-  gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
-
-  gfx::Display GetPrimaryDisplay() const override {
-    gfx::DeviceDisplayInfo device_info;
-    const float device_scale_factor = device_info.GetDIPScale();
-    // Note: GetPhysicalDisplayWidth/Height() does not subtract window
-    // decorations etc. Use it instead of GetDisplayWidth/Height() when
-    // available.
-    const gfx::Rect bounds_in_pixels =
-        gfx::Rect(device_info.GetPhysicalDisplayWidth()
-                      ? device_info.GetPhysicalDisplayWidth()
-                      : device_info.GetDisplayWidth(),
-                  device_info.GetPhysicalDisplayHeight()
-                      ? device_info.GetPhysicalDisplayHeight()
-                      : device_info.GetDisplayHeight());
-    const gfx::Rect bounds_in_dip = gfx::Rect(gfx::ScaleToCeiledSize(
-        bounds_in_pixels.size(), 1.0f / device_scale_factor));
-    gfx::Display display(0, bounds_in_dip);
-    if (!gfx::Display::HasForceDeviceScaleFactor())
-      display.set_device_scale_factor(device_scale_factor);
-    display.SetRotationAsDegree(device_info.GetRotationDegrees());
-    return display;
-  }
-
-  gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override {
-    return GetPrimaryDisplay();
-  }
-
-  gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override {
-    return GetPrimaryDisplay();
-  }
-
-  int GetNumDisplays() const override { return 1; }
-
-  std::vector<gfx::Display> GetAllDisplays() const override {
-    return std::vector<gfx::Display>(1, GetPrimaryDisplay());
-  }
-
-  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override {
-    return GetPrimaryDisplay();
-  }
-
-  void AddObserver(DisplayObserver* observer) override {
-    // no display change on Android.
-  }
-
-  void RemoveObserver(DisplayObserver* observer) override {
-    // no display change on Android.
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ScreenAndroid);
-};
-
 Screen* CreateNativeScreen() {
-  return new ScreenAndroid;
+  NOTREACHED() << "Implementation should be installed at higher level.";
+  return NULL;
 }
 
 }  // namespace gfx