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_AURA_TEST_TEST_SCREEN_H_ | 5 #ifndef UI_AURA_TEST_TEST_SCREEN_H_ |
6 #define UI_AURA_TEST_TEST_SCREEN_H_ | 6 #define UI_AURA_TEST_TEST_SCREEN_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "ui/aura/window_observer.h" | 10 #include "ui/aura/window_observer.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 const gfx::Rect& old_bounds, | 49 const gfx::Rect& old_bounds, |
50 const gfx::Rect& new_bounds) override; | 50 const gfx::Rect& new_bounds) override; |
51 void OnWindowDestroying(Window* window) override; | 51 void OnWindowDestroying(Window* window) override; |
52 | 52 |
53 // display::Screen overrides: | 53 // display::Screen overrides: |
54 gfx::Point GetCursorScreenPoint() override; | 54 gfx::Point GetCursorScreenPoint() override; |
55 bool IsWindowUnderCursor(gfx::NativeWindow window) override; | 55 bool IsWindowUnderCursor(gfx::NativeWindow window) override; |
56 gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override; | 56 gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override; |
57 int GetNumDisplays() const override; | 57 int GetNumDisplays() const override; |
58 std::vector<display::Display> GetAllDisplays() const override; | 58 std::vector<display::Display> GetAllDisplays() const override; |
| 59 bool GetDisplayWithDisplayId(int64_t display_id, |
| 60 display::Display* display) const override; |
59 display::Display GetDisplayNearestWindow(gfx::NativeView view) const override; | 61 display::Display GetDisplayNearestWindow(gfx::NativeView view) const override; |
60 display::Display GetDisplayNearestPoint( | 62 display::Display GetDisplayNearestPoint( |
61 const gfx::Point& point) const override; | 63 const gfx::Point& point) const override; |
62 display::Display GetDisplayMatching( | 64 display::Display GetDisplayMatching( |
63 const gfx::Rect& match_rect) const override; | 65 const gfx::Rect& match_rect) const override; |
64 void AddObserver(display::DisplayObserver* observer) override; | 66 void AddObserver(display::DisplayObserver* observer) override; |
65 void RemoveObserver(display::DisplayObserver* observer) override; | 67 void RemoveObserver(display::DisplayObserver* observer) override; |
66 | 68 |
67 private: | 69 private: |
68 explicit TestScreen(const gfx::Rect& screen_bounds); | 70 explicit TestScreen(const gfx::Rect& screen_bounds); |
69 | 71 |
70 aura::WindowTreeHost* host_; | 72 aura::WindowTreeHost* host_; |
71 | 73 |
72 display::Display display_; | 74 display::Display display_; |
73 | 75 |
74 float ui_scale_; | 76 float ui_scale_; |
75 | 77 |
76 DISALLOW_COPY_AND_ASSIGN(TestScreen); | 78 DISALLOW_COPY_AND_ASSIGN(TestScreen); |
77 }; | 79 }; |
78 | 80 |
79 } // namespace aura | 81 } // namespace aura |
80 | 82 |
81 #endif // UI_AURA_TEST_TEST_SCREEN_H_ | 83 #endif // UI_AURA_TEST_TEST_SCREEN_H_ |
OLD | NEW |