Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(654)

Unified Diff: ui/display/win/screen_win.h

Issue 1913613002: Add place holder to move gfx::Display/Screen to ui/display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/display/win/display_info.cc ('k') | ui/display/win/screen_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/win/screen_win.h
diff --git a/ui/display/win/screen_win.h b/ui/display/win/screen_win.h
index c50370777d41e72cdd668a74e4eb844cf905d3a3..c35c9b3f0c3e17acecc48879163bc2be6df4388b 100644
--- a/ui/display/win/screen_win.h
+++ b/ui/display/win/screen_win.h
@@ -12,9 +12,9 @@
#include "base/macros.h"
#include "ui/display/display_export.h"
+#include "ui/display/screen.h"
#include "ui/gfx/display_change_notifier.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/screen.h"
#include "ui/gfx/win/singleton_hwnd_observer.h"
namespace gfx {
@@ -30,7 +30,7 @@ namespace win {
class DisplayInfo;
class ScreenWinDisplay;
-class DISPLAY_EXPORT ScreenWin : public gfx::Screen {
+class DISPLAY_EXPORT ScreenWin : public display::Screen {
public:
ScreenWin();
~ScreenWin() override;
@@ -96,18 +96,21 @@ class DISPLAY_EXPORT ScreenWin : public gfx::Screen {
virtual gfx::NativeWindow GetNativeWindowFromHWND(HWND hwnd) const;
protected:
- // gfx::Screen:
+ // display::Screen:
gfx::Point GetCursorScreenPoint() override;
gfx::NativeWindow GetWindowUnderCursor() override;
gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
int GetNumDisplays() const override;
- std::vector<gfx::Display> GetAllDisplays() const override;
- gfx::Display GetDisplayNearestWindow(gfx::NativeView window) const override;
- gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override;
- gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
- gfx::Display GetPrimaryDisplay() const override;
- void AddObserver(gfx::DisplayObserver* observer) override;
- void RemoveObserver(gfx::DisplayObserver* observer) override;
+ std::vector<display::Display> GetAllDisplays() const override;
+ display::Display GetDisplayNearestWindow(
+ gfx::NativeView window) const override;
+ display::Display GetDisplayNearestPoint(
+ const gfx::Point& point) const override;
+ display::Display GetDisplayMatching(
+ const gfx::Rect& match_rect) const override;
+ display::Display GetPrimaryDisplay() const override;
+ void AddObserver(display::DisplayObserver* observer) override;
+ void RemoveObserver(display::DisplayObserver* observer) override;
void UpdateFromDisplayInfos(const std::vector<DisplayInfo>& display_infos);
« no previous file with comments | « ui/display/win/display_info.cc ('k') | ui/display/win/screen_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698