| Index: ui/gfx/screen_android.cc
|
| diff --git a/ui/gfx/screen_android.cc b/ui/gfx/screen_android.cc
|
| index 1f2f5f8bfd10a6495af16f6abfbb75c5eef9c3fc..c286e603f2d8b621662a47f7cce4a0755cbd92a0 100644
|
| --- a/ui/gfx/screen_android.cc
|
| +++ b/ui/gfx/screen_android.cc
|
| @@ -15,20 +15,19 @@ class ScreenAndroid : public Screen {
|
| public:
|
| ScreenAndroid() {}
|
|
|
| - virtual gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
|
| + gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
|
|
|
| - virtual gfx::NativeWindow GetWindowUnderCursor() override {
|
| + gfx::NativeWindow GetWindowUnderCursor() override {
|
| NOTIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|
| - virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
|
| - override {
|
| + gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
|
| NOTIMPLEMENTED();
|
| return NULL;
|
| }
|
|
|
| - virtual gfx::Display GetPrimaryDisplay() const override {
|
| + gfx::Display GetPrimaryDisplay() const override {
|
| gfx::DeviceDisplayInfo device_info;
|
| const float device_scale_factor = device_info.GetDIPScale();
|
| // Note: GetPhysicalDisplayWidth/Height() does not subtract window
|
| @@ -51,32 +50,29 @@ class ScreenAndroid : public Screen {
|
| return display;
|
| }
|
|
|
| - virtual gfx::Display GetDisplayNearestWindow(
|
| - gfx::NativeView view) const override {
|
| + gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override {
|
| return GetPrimaryDisplay();
|
| }
|
|
|
| - virtual gfx::Display GetDisplayNearestPoint(
|
| - const gfx::Point& point) const override {
|
| + gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override {
|
| return GetPrimaryDisplay();
|
| }
|
|
|
| - virtual int GetNumDisplays() const override { return 1; }
|
| + int GetNumDisplays() const override { return 1; }
|
|
|
| - virtual std::vector<gfx::Display> GetAllDisplays() const override {
|
| + std::vector<gfx::Display> GetAllDisplays() const override {
|
| return std::vector<gfx::Display>(1, GetPrimaryDisplay());
|
| }
|
|
|
| - virtual gfx::Display GetDisplayMatching(
|
| - const gfx::Rect& match_rect) const override {
|
| + gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override {
|
| return GetPrimaryDisplay();
|
| }
|
|
|
| - virtual void AddObserver(DisplayObserver* observer) override {
|
| + void AddObserver(DisplayObserver* observer) override {
|
| // no display change on Android.
|
| }
|
|
|
| - virtual void RemoveObserver(DisplayObserver* observer) override {
|
| + void RemoveObserver(DisplayObserver* observer) override {
|
| // no display change on Android.
|
| }
|
|
|
|
|