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 EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ | 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ |
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ | 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "ui/aura/window_observer.h" | 9 #include "ui/aura/window_observer.h" |
10 #include "ui/display/display.h" | 10 #include "ui/display/display.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 const gfx::Rect& old_bounds, | 36 const gfx::Rect& old_bounds, |
37 const gfx::Rect& new_bounds) override; | 37 const gfx::Rect& new_bounds) override; |
38 void OnWindowDestroying(aura::Window* window) override; | 38 void OnWindowDestroying(aura::Window* window) override; |
39 | 39 |
40 // display::Screen overrides: | 40 // display::Screen overrides: |
41 gfx::Point GetCursorScreenPoint() override; | 41 gfx::Point GetCursorScreenPoint() override; |
42 bool IsWindowUnderCursor(gfx::NativeWindow window) override; | 42 bool IsWindowUnderCursor(gfx::NativeWindow window) override; |
43 gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override; | 43 gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override; |
44 int GetNumDisplays() const override; | 44 int GetNumDisplays() const override; |
45 std::vector<display::Display> GetAllDisplays() const override; | 45 std::vector<display::Display> GetAllDisplays() const override; |
| 46 bool GetDisplayWithDisplayId(int64_t display_id, |
| 47 display::Display* display) const override; |
46 display::Display GetDisplayNearestWindow(gfx::NativeView view) const override; | 48 display::Display GetDisplayNearestWindow(gfx::NativeView view) const override; |
47 display::Display GetDisplayNearestPoint( | 49 display::Display GetDisplayNearestPoint( |
48 const gfx::Point& point) const override; | 50 const gfx::Point& point) const override; |
49 display::Display GetDisplayMatching( | 51 display::Display GetDisplayMatching( |
50 const gfx::Rect& match_rect) const override; | 52 const gfx::Rect& match_rect) const override; |
51 display::Display GetPrimaryDisplay() const override; | 53 display::Display GetPrimaryDisplay() const override; |
52 void AddObserver(display::DisplayObserver* observer) override; | 54 void AddObserver(display::DisplayObserver* observer) override; |
53 void RemoveObserver(display::DisplayObserver* observer) override; | 55 void RemoveObserver(display::DisplayObserver* observer) override; |
54 | 56 |
55 private: | 57 private: |
56 aura::WindowTreeHost* host_; // Not owned. | 58 aura::WindowTreeHost* host_; // Not owned. |
57 display::Display display_; | 59 display::Display display_; |
58 | 60 |
59 DISALLOW_COPY_AND_ASSIGN(ShellScreen); | 61 DISALLOW_COPY_AND_ASSIGN(ShellScreen); |
60 }; | 62 }; |
61 | 63 |
62 } // namespace extensions | 64 } // namespace extensions |
63 | 65 |
64 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ | 66 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_SCREEN_H_ |
OLD | NEW |