| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 virtual gfx::Display GetDisplayNearestPoint( | 43 virtual gfx::Display GetDisplayNearestPoint( |
| 44 const gfx::Point& point) const override; | 44 const gfx::Point& point) const override; |
| 45 virtual gfx::Display GetDisplayMatching( | 45 virtual gfx::Display GetDisplayMatching( |
| 46 const gfx::Rect& match_rect) const override; | 46 const gfx::Rect& match_rect) const override; |
| 47 virtual gfx::Display GetPrimaryDisplay() const override; | 47 virtual gfx::Display GetPrimaryDisplay() const override; |
| 48 virtual void AddObserver(gfx::DisplayObserver* observer) override; | 48 virtual void AddObserver(gfx::DisplayObserver* observer) override; |
| 49 virtual void RemoveObserver(gfx::DisplayObserver* observer) override; | 49 virtual void RemoveObserver(gfx::DisplayObserver* observer) override; |
| 50 | 50 |
| 51 // ui::PlatformEventDispatcher: | 51 // ui::PlatformEventDispatcher: |
| 52 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; | 52 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) override; |
| 53 virtual uint32_t DispatchEvent(const ui::PlatformEvent& event) override; | 53 virtual ui::PostDispatchAction DispatchEvent( |
| 54 const ui::PlatformEvent& event) override; |
| 54 | 55 |
| 55 private: | 56 private: |
| 56 friend class DesktopScreenX11Test; | 57 friend class DesktopScreenX11Test; |
| 57 | 58 |
| 58 // Constructor used in tests. | 59 // Constructor used in tests. |
| 59 DesktopScreenX11(const std::vector<gfx::Display>& test_displays); | 60 DesktopScreenX11(const std::vector<gfx::Display>& test_displays); |
| 60 | 61 |
| 61 // Builds a list of displays from the current screen information offered by | 62 // Builds a list of displays from the current screen information offered by |
| 62 // the X server. | 63 // the X server. |
| 63 std::vector<gfx::Display> BuildDisplaysFromXRandRInfo(); | 64 std::vector<gfx::Display> BuildDisplaysFromXRandRInfo(); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 83 scoped_ptr<base::OneShotTimer<DesktopScreenX11> > configure_timer_; | 84 scoped_ptr<base::OneShotTimer<DesktopScreenX11> > configure_timer_; |
| 84 | 85 |
| 85 gfx::DisplayChangeNotifier change_notifier_; | 86 gfx::DisplayChangeNotifier change_notifier_; |
| 86 | 87 |
| 87 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); | 88 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); |
| 88 }; | 89 }; |
| 89 | 90 |
| 90 } // namespace views | 91 } // namespace views |
| 91 | 92 |
| 92 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 93 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ |
| OLD | NEW |