| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_DISPLAY_CHROMEOS_X11_DISPLAY_MODE_X11_H_ | 5 #ifndef UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_MODE_X11_H_ |
| 6 #define UI_DISPLAY_CHROMEOS_X11_DISPLAY_MODE_X11_H_ | 6 #define UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_MODE_X11_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "ui/display/display_export.h" | 9 #include "ui/display/manager/display_manager_export.h" |
| 10 #include "ui/display/types/display_mode.h" | 10 #include "ui/display/types/display_mode.h" |
| 11 | 11 |
| 12 // Forward declare from Xlib and Xrandr. | 12 // Forward declare from Xlib and Xrandr. |
| 13 typedef unsigned long XID; | 13 typedef unsigned long XID; |
| 14 typedef XID RRMode; | 14 typedef XID RRMode; |
| 15 | 15 |
| 16 namespace ui { | 16 namespace ui { |
| 17 | 17 |
| 18 class DISPLAY_EXPORT DisplayModeX11 : public DisplayMode { | 18 class DISPLAY_MANAGER_EXPORT DisplayModeX11 : public DisplayMode { |
| 19 public: | 19 public: |
| 20 DisplayModeX11(const gfx::Size& size, | 20 DisplayModeX11(const gfx::Size& size, |
| 21 bool interlaced, | 21 bool interlaced, |
| 22 float refresh_rate, | 22 float refresh_rate, |
| 23 RRMode mode_id); | 23 RRMode mode_id); |
| 24 ~DisplayModeX11() override; | 24 ~DisplayModeX11() override; |
| 25 std::unique_ptr<DisplayMode> Clone() const override; | 25 std::unique_ptr<DisplayMode> Clone() const override; |
| 26 | 26 |
| 27 RRMode mode_id() const { return mode_id_; } | 27 RRMode mode_id() const { return mode_id_; } |
| 28 | 28 |
| 29 private: | 29 private: |
| 30 RRMode mode_id_; | 30 RRMode mode_id_; |
| 31 | 31 |
| 32 DISALLOW_COPY_AND_ASSIGN(DisplayModeX11); | 32 DISALLOW_COPY_AND_ASSIGN(DisplayModeX11); |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 } // namespace ui | 35 } // namespace ui |
| 36 | 36 |
| 37 #endif // UI_DISPLAY_CHROMEOS_X11_DISPLAY_MODE_X11_H_ | 37 #endif // UI_DISPLAY_MANAGER_CHROMEOS_X11_DISPLAY_MODE_X11_H_ |
| OLD | NEW |