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

Unified Diff: ui/display/screen.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/manager/managed_display_info.cc ('k') | ui/display/screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/screen.h
diff --git a/ui/display/screen.h b/ui/display/screen.h
index 3e1b0a0f13de434872dad1f469cd2831aac1a33d..3bff5bdb6406f2bb5256fb552cb8642c5951b2dd 100644
--- a/ui/display/screen.h
+++ b/ui/display/screen.h
@@ -53,24 +53,21 @@ class DISPLAY_EXPORT Screen {
virtual int GetNumDisplays() const = 0;
// Returns the list of displays that are currently available.
- virtual const std::vector<display::Display>& GetAllDisplays() const = 0;
+ virtual const std::vector<Display>& GetAllDisplays() const = 0;
// Returns the display nearest the specified window.
// If the window is NULL or the window is not rooted to a display this will
// return the primary display.
- virtual display::Display GetDisplayNearestWindow(
- gfx::NativeView view) const = 0;
+ virtual Display GetDisplayNearestWindow(gfx::NativeView view) const = 0;
// Returns the display nearest the specified point. |point| should be in DIPs.
- virtual display::Display GetDisplayNearestPoint(
- const gfx::Point& point) const = 0;
+ virtual Display GetDisplayNearestPoint(const gfx::Point& point) const = 0;
// Returns the display that most closely intersects the provided bounds.
- virtual display::Display GetDisplayMatching(
- const gfx::Rect& match_rect) const = 0;
+ virtual Display GetDisplayMatching(const gfx::Rect& match_rect) const = 0;
// Returns the primary display.
- virtual display::Display GetPrimaryDisplay() const = 0;
+ virtual Display GetPrimaryDisplay() const = 0;
// Adds/Removes display observers.
virtual void AddObserver(DisplayObserver* observer) = 0;
@@ -91,8 +88,7 @@ class DISPLAY_EXPORT Screen {
// Returns true if the display with |display_id| is found and returns that
// display in |display|. Otherwise returns false and |display| remains
// untouched.
- bool GetDisplayWithDisplayId(int64_t display_id,
- display::Display* display) const;
+ bool GetDisplayWithDisplayId(int64_t display_id, Display* display) const;
private:
DISALLOW_COPY_AND_ASSIGN(Screen);
« no previous file with comments | « ui/display/manager/managed_display_info.cc ('k') | ui/display/screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698