| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_SCREEN_H_ | 5 #ifndef UI_DISPLAY_SCREEN_H_ |
| 6 #define UI_DISPLAY_SCREEN_H_ | 6 #define UI_DISPLAY_SCREEN_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "ui/display/display.h" | 11 #include "ui/display/display.h" |
| 12 #include "ui/display/display_export.h" | 12 #include "ui/display/display_export.h" |
| 13 #include "ui/gfx/native_widget_types.h" | 13 #include "ui/gfx/native_widget_types.h" |
| 14 | 14 |
| 15 namespace gfx { | 15 namespace gfx { |
| 16 class Display; | |
| 17 class Point; | 16 class Point; |
| 18 class Rect; | 17 class Rect; |
| 19 } | 18 } |
| 20 | 19 |
| 21 namespace display { | 20 namespace display { |
| 22 using Display = gfx::Display; | 21 class Display; |
| 23 class DisplayObserver; | 22 class DisplayObserver; |
| 24 | 23 |
| 25 // A utility class for getting various info about screen size, displays, | 24 // A utility class for getting various info about screen size, displays, |
| 26 // cursor position, etc. | 25 // cursor position, etc. |
| 27 // | 26 // |
| 28 // Note that this class does not represent an individual display connected to a | 27 // Note that this class does not represent an individual display connected to a |
| 29 // computer -- see the Display class for that. A single Screen object exists | 28 // computer -- see the Display class for that. A single Screen object exists |
| 30 // regardless of the number of connected displays. | 29 // regardless of the number of connected displays. |
| 31 class DISPLAY_EXPORT Screen { | 30 class DISPLAY_EXPORT Screen { |
| 32 public: | 31 public: |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 | 91 |
| 93 private: | 92 private: |
| 94 DISALLOW_COPY_AND_ASSIGN(Screen); | 93 DISALLOW_COPY_AND_ASSIGN(Screen); |
| 95 }; | 94 }; |
| 96 | 95 |
| 97 Screen* CreateNativeScreen(); | 96 Screen* CreateNativeScreen(); |
| 98 | 97 |
| 99 } // namespace display | 98 } // namespace display |
| 100 | 99 |
| 101 #endif // UI_DISPLAY_SCREEN_H_ | 100 #endif // UI_DISPLAY_SCREEN_H_ |
| OLD | NEW |