| Index: ui/gfx/screen_ios.mm
|
| diff --git a/ui/gfx/screen_ios.mm b/ui/gfx/screen_ios.mm
|
| index e05568e488dd88f27c27c8d2eda8024130889e56..6ace9c8ed2975a68a9be4b7216539cf2ebd03581 100644
|
| --- a/ui/gfx/screen_ios.mm
|
| +++ b/ui/gfx/screen_ios.mm
|
| @@ -12,23 +12,22 @@
|
| namespace {
|
|
|
| class ScreenIos : public gfx::Screen {
|
| - virtual gfx::Point GetCursorScreenPoint() override {
|
| + 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 +36,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 +68,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.
|
| }
|
| };
|
|
|