| Index: ui/display/screen.h
|
| diff --git a/ui/display/screen.h b/ui/display/screen.h
|
| index 3bff5bdb6406f2bb5256fb552cb8642c5951b2dd..da0810110cb051808434b8c8a36121b895fb21a9 100644
|
| --- a/ui/display/screen.h
|
| +++ b/ui/display/screen.h
|
| @@ -58,7 +58,7 @@ class DISPLAY_EXPORT Screen {
|
| // 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 GetDisplayNearestWindow(gfx::NativeView view) const = 0;
|
| + virtual Display GetDisplayNearestWindow(gfx::NativeWindow window) const = 0;
|
|
|
| // Returns the display nearest the specified point. |point| should be in DIPs.
|
| virtual Display GetDisplayNearestPoint(const gfx::Point& point) const = 0;
|
| @@ -76,13 +76,13 @@ class DISPLAY_EXPORT Screen {
|
| // Converts |screen_rect| to DIP coordinates in the context of |view| clamping
|
| // to the enclosing rect if the coordinates do not fall on pixel boundaries.
|
| // If |view| is null, the primary display is used as the context.
|
| - virtual gfx::Rect ScreenToDIPRectInWindow(gfx::NativeView view,
|
| + virtual gfx::Rect ScreenToDIPRectInWindow(gfx::NativeWindow window,
|
| const gfx::Rect& screen_rect) const;
|
|
|
| // Converts |dip_rect| to screen coordinates in the context of |view| clamping
|
| // to the enclosing rect if the coordinates do not fall on pixel boundaries.
|
| // If |view| is null, the primary display is used as the context.
|
| - virtual gfx::Rect DIPToScreenRectInWindow(gfx::NativeView view,
|
| + virtual gfx::Rect DIPToScreenRectInWindow(gfx::NativeWindow winow,
|
| const gfx::Rect& dip_rect) const;
|
|
|
| // Returns true if the display with |display_id| is found and returns that
|
|
|