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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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/dpi.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 2a7cdb10de6ca5eead27df233c870382593166b0..94379e055f3245938004c1689456f803f0aad7c9 100644
--- a/ui/display/win/screen_win.h
+++ b/ui/display/win/screen_win.h
@@ -30,7 +30,7 @@ namespace win {
class DisplayInfo;
class ScreenWinDisplay;
-class DISPLAY_EXPORT ScreenWin : public display::Screen {
+class DISPLAY_EXPORT ScreenWin : public Screen {
public:
ScreenWin();
~ScreenWin() override;
@@ -109,21 +109,18 @@ class DISPLAY_EXPORT ScreenWin : public display::Screen {
virtual gfx::NativeWindow GetNativeWindowFromHWND(HWND hwnd) const;
protected:
- // display::Screen:
+ // Screen:
gfx::Point GetCursorScreenPoint() override;
bool IsWindowUnderCursor(gfx::NativeWindow window) override;
gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
int GetNumDisplays() const override;
- const 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;
+ const std::vector<Display>& GetAllDisplays() const override;
+ Display GetDisplayNearestWindow(gfx::NativeView window) const override;
+ Display GetDisplayNearestPoint(const gfx::Point& point) const override;
+ Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
+ Display GetPrimaryDisplay() const override;
+ void AddObserver(DisplayObserver* observer) override;
+ void RemoveObserver(DisplayObserver* observer) override;
gfx::Rect ScreenToDIPRectInWindow(
gfx::NativeView view, const gfx::Rect& screen_rect) const override;
gfx::Rect DIPToScreenRectInWindow(
@@ -185,10 +182,9 @@ class DISPLAY_EXPORT ScreenWin : public display::Screen {
// Current list of ScreenWinDisplays.
std::vector<ScreenWinDisplay> screen_win_displays_;
- // The display::Displays corresponding to |screen_win_displays_| for
- // GetAllDisplays(). This must be updated anytime |screen_win_displays_| is
- // updated.
- std::vector<display::Display> displays_;
+ // The Displays corresponding to |screen_win_displays_| for GetAllDisplays().
+ // This must be updated anytime |screen_win_displays_| is updated.
+ std::vector<Display> displays_;
DISALLOW_COPY_AND_ASSIGN(ScreenWin);
};
« no previous file with comments | « ui/display/win/dpi.cc ('k') | ui/display/win/screen_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698