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/observer_list.h" | 8 #include "base/observer_list.h" |
9 #include "base/timer/timer.h" | 9 #include "base/timer/timer.h" |
10 #include "ui/events/platform/platform_event_dispatcher.h" | 10 #include "ui/events/platform/platform_event_dispatcher.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 // Overridden from gfx::Screen: | 37 // Overridden from gfx::Screen: |
38 virtual bool IsDIPEnabled() OVERRIDE; | 38 virtual bool IsDIPEnabled() OVERRIDE; |
39 virtual gfx::Point GetCursorScreenPoint() OVERRIDE; | 39 virtual gfx::Point GetCursorScreenPoint() OVERRIDE; |
40 virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; | 40 virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE; |
41 virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) | 41 virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) |
42 OVERRIDE; | 42 OVERRIDE; |
43 virtual int GetNumDisplays() const OVERRIDE; | 43 virtual int GetNumDisplays() const OVERRIDE; |
44 virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE; | 44 virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE; |
45 virtual gfx::Display GetDisplayNearestWindow( | 45 virtual gfx::Display GetDisplayNearestWindow( |
46 gfx::NativeView window) const OVERRIDE; | 46 gfx::NativeView window) const OVERRIDE; |
| 47 virtual bool GetDisplayColorProfile( |
| 48 gfx::NativeView view, std::vector<char>* color_profile) const OVERRIDE; |
47 virtual gfx::Display GetDisplayNearestPoint( | 49 virtual gfx::Display GetDisplayNearestPoint( |
48 const gfx::Point& point) const OVERRIDE; | 50 const gfx::Point& point) const OVERRIDE; |
49 virtual gfx::Display GetDisplayMatching( | 51 virtual gfx::Display GetDisplayMatching( |
50 const gfx::Rect& match_rect) const OVERRIDE; | 52 const gfx::Rect& match_rect) const OVERRIDE; |
51 virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; | 53 virtual gfx::Display GetPrimaryDisplay() const OVERRIDE; |
52 virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE; | 54 virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE; |
53 virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE; | 55 virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE; |
54 | 56 |
55 // ui::PlatformEventDispatcher: | 57 // ui::PlatformEventDispatcher: |
56 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; | 58 virtual bool CanDispatchEvent(const ui::PlatformEvent& event) OVERRIDE; |
(...skipping 30 matching lines...) Expand all Loading... |
87 scoped_ptr<base::OneShotTimer<DesktopScreenX11> > configure_timer_; | 89 scoped_ptr<base::OneShotTimer<DesktopScreenX11> > configure_timer_; |
88 | 90 |
89 ObserverList<gfx::DisplayObserver> observer_list_; | 91 ObserverList<gfx::DisplayObserver> observer_list_; |
90 | 92 |
91 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); | 93 DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11); |
92 }; | 94 }; |
93 | 95 |
94 } // namespace views | 96 } // namespace views |
95 | 97 |
96 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ | 98 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_SCREEN_X11_H_ |
OLD | NEW |