Chromium Code Reviews| Index: ui/display/display_finder.h |
| diff --git a/ui/gfx/display_finder.h b/ui/display/display_finder.h |
| similarity index 56% |
| rename from ui/gfx/display_finder.h |
| rename to ui/display/display_finder.h |
| index 2fb81f6eb4472852f98092553fcd3ea53bb75131..9adabfbd5c7a1ceb3b8bf67ef4723ad8931f2f2a 100644 |
| --- a/ui/gfx/display_finder.h |
| +++ b/ui/display/display_finder.h |
| @@ -2,30 +2,33 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef UI_GFX_DISPLAY_FINDER_H_ |
| -#define UI_GFX_DISPLAY_FINDER_H_ |
| +#ifndef UI_DISPLAY_DISPLAY_FINDER_H_ |
| +#define UI_DISPLAY_DISPLAY_FINDER_H_ |
| #include <vector> |
| -#include "ui/gfx/gfx_export.h" |
| +#include "ui/display/display_export.h" |
| namespace gfx { |
| - |
| class Display; |
| class Point; |
| class Rect; |
| +} |
| + |
| +namespace display { |
| +using Display = gfx::Display; |
|
Daniel Erat
2016/05/09 17:42:20
i have a preference for avoiding using directives
oshima
2016/05/09 17:56:54
This is necessary to convert the client of this he
|
| // Returns the display in |displays| closest to |point|. |
| -GFX_EXPORT const Display* FindDisplayNearestPoint( |
| +DISPLAY_EXPORT const Display* FindDisplayNearestPoint( |
| const std::vector<Display>& displays, |
| - const Point& point); |
| + const gfx::Point& point); |
| // Returns the display in |displays| with the biggest intersection of |rect|. |
| // If none of the displays intersect |rect| null is returned. |
| -GFX_EXPORT const Display* FindDisplayWithBiggestIntersection( |
| +DISPLAY_EXPORT const Display* FindDisplayWithBiggestIntersection( |
| const std::vector<Display>& displays, |
| - const Rect& rect); |
| + const gfx::Rect& rect); |
| -} // namespace gfx |
| +} // namespace display |
| -#endif // UI_GFX_DISPLAY_FINDER_H_ |
| +#endif // UI_DISPLAY_DISPLAY_FINDER_H_ |