Chromium Code Reviews| Index: ui/gfx/screen_ios.mm |
| diff --git a/ui/gfx/screen_ios.mm b/ui/gfx/screen_ios.mm |
| index e05568e488dd88f27c27c8d2eda8024130889e56..49c15425ce0ef8650550762da1d4aa934224f3ec 100644 |
| --- a/ui/gfx/screen_ios.mm |
| +++ b/ui/gfx/screen_ios.mm |
| @@ -1,4 +1,4 @@ |
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| +// Copyright 2012 The Chromium Authors. All rights reserved. |
|
Nico
2015/01/20 15:48:27
?
|
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| @@ -12,23 +12,24 @@ |
| namespace { |
| class ScreenIos : public gfx::Screen { |
| - virtual gfx::Point GetCursorScreenPoint() override { |
| + ~ScreenIos() override {} |
|
Nico
2015/01/20 15:48:27
this shouldn't be needed?
droger
2015/01/20 16:13:06
Oh right, this is a mistake.
|
| + |
| + gfx::Point GetCursorScreenPoint() override { |
| NOTIMPLEMENTED(); |
| return gfx::Point(0, 0); |
| } |
| - virtual gfx::NativeWindow GetWindowUnderCursor() override { |
| + gfx::NativeWindow GetWindowUnderCursor() override { |
| NOTIMPLEMENTED(); |
| return gfx::NativeWindow(); |
| } |
| - virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) |
| - override { |
| + gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override { |
| NOTIMPLEMENTED(); |
| return gfx::NativeWindow(); |
| } |
| - virtual int GetNumDisplays() const override { |
| + int GetNumDisplays() const override { |
| #if TARGET_IPHONE_SIMULATOR |
| // UIScreen does not reliably return correct results on the simulator. |
| return 1; |
| @@ -37,34 +38,31 @@ class ScreenIos : public gfx::Screen { |
| #endif |
| } |
| - virtual std::vector<gfx::Display> GetAllDisplays() const override { |
| + std::vector<gfx::Display> GetAllDisplays() const override { |
| NOTIMPLEMENTED(); |
| return std::vector<gfx::Display>(1, GetPrimaryDisplay()); |
| } |
| // Returns the display nearest the specified window. |
| - virtual gfx::Display GetDisplayNearestWindow( |
| - gfx::NativeView view) const override { |
| + gfx::Display GetDisplayNearestWindow(gfx::NativeView view) const override { |
| NOTIMPLEMENTED(); |
| return gfx::Display(); |
| } |
| // Returns the the display nearest the specified point. |
| - virtual gfx::Display GetDisplayNearestPoint( |
| - const gfx::Point& point) const override { |
| + gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override { |
| NOTIMPLEMENTED(); |
| return gfx::Display(); |
| } |
| // Returns the display that most closely intersects the provided bounds. |
| - virtual gfx::Display GetDisplayMatching( |
| - const gfx::Rect& match_rect) const override { |
| + gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override { |
| NOTIMPLEMENTED(); |
| return gfx::Display(); |
| } |
| // Returns the primary display. |
| - virtual gfx::Display GetPrimaryDisplay() const override { |
| + gfx::Display GetPrimaryDisplay() const override { |
| UIScreen* mainScreen = [UIScreen mainScreen]; |
| CHECK(mainScreen); |
| gfx::Display display(0, gfx::Rect(mainScreen.bounds)); |
| @@ -72,11 +70,11 @@ class ScreenIos : public gfx::Screen { |
| return display; |
| } |
| - virtual void AddObserver(gfx::DisplayObserver* observer) override { |
| + void AddObserver(gfx::DisplayObserver* observer) override { |
| // no display change on iOS. |
| } |
| - virtual void RemoveObserver(gfx::DisplayObserver* observer) override { |
| + void RemoveObserver(gfx::DisplayObserver* observer) override { |
| // no display change on iOS. |
| } |
| }; |