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