| OLD | NEW | 
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 
| 7 | 7 | 
| 8 #include "base/timer/timer.h" | 8 #include "base/timer/timer.h" | 
| 9 #include "ui/events/platform/platform_event_dispatcher.h" | 9 #include "ui/events/platform/platform_event_dispatcher.h" | 
| 10 #include "ui/gfx/display_change_notifier.h" | 10 #include "ui/gfx/display_change_notifier.h" | 
| (...skipping 13 matching lines...) Expand all  Loading... | 
| 24 | 24 | 
| 25 // Our singleton screen implementation that talks to xrandr. | 25 // Our singleton screen implementation that talks to xrandr. | 
| 26 class VIEWS_EXPORT DesktopScreenX11 : public gfx::Screen, | 26 class VIEWS_EXPORT DesktopScreenX11 : public gfx::Screen, | 
| 27                                       public ui::PlatformEventDispatcher { | 27                                       public ui::PlatformEventDispatcher { | 
| 28  public: | 28  public: | 
| 29   DesktopScreenX11(); | 29   DesktopScreenX11(); | 
| 30 | 30 | 
| 31   virtual ~DesktopScreenX11(); | 31   virtual ~DesktopScreenX11(); | 
| 32 | 32 | 
| 33   // Overridden from gfx::Screen: | 33   // Overridden from gfx::Screen: | 
| 34   virtual bool IsDIPEnabled() override; |  | 
| 35   virtual gfx::Point GetCursorScreenPoint() override; | 34   virtual gfx::Point GetCursorScreenPoint() override; | 
| 36   virtual gfx::NativeWindow GetWindowUnderCursor() override; | 35   virtual gfx::NativeWindow GetWindowUnderCursor() override; | 
| 37   virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) | 36   virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) | 
| 38       override; | 37       override; | 
| 39   virtual int GetNumDisplays() const override; | 38   virtual int GetNumDisplays() const override; | 
| 40   virtual std::vector<gfx::Display> GetAllDisplays() const override; | 39   virtual std::vector<gfx::Display> GetAllDisplays() const override; | 
| 41   virtual gfx::Display GetDisplayNearestWindow( | 40   virtual gfx::Display GetDisplayNearestWindow( | 
| 42       gfx::NativeView window) const override; | 41       gfx::NativeView window) const override; | 
| 43   virtual gfx::Display GetDisplayNearestPoint( | 42   virtual gfx::Display GetDisplayNearestPoint( | 
| 44       const gfx::Point& point) const override; | 43       const gfx::Point& point) const override; | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 83   scoped_ptr<base::OneShotTimer<DesktopScreenX11> > configure_timer_; | 82   scoped_ptr<base::OneShotTimer<DesktopScreenX11> > configure_timer_; | 
| 84 | 83 | 
| 85   gfx::DisplayChangeNotifier change_notifier_; | 84   gfx::DisplayChangeNotifier change_notifier_; | 
| 86 | 85 | 
| 87   DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); | 86   DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); | 
| 88 }; | 87 }; | 
| 89 | 88 | 
| 90 }  // namespace views | 89 }  // namespace views | 
| 91 | 90 | 
| 92 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 91 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 
| OLD | NEW | 
|---|