| Index: ui/display/test/test_screen.cc
|
| diff --git a/ui/gfx/test/test_screen.cc b/ui/display/test/test_screen.cc
|
| similarity index 53%
|
| rename from ui/gfx/test/test_screen.cc
|
| rename to ui/display/test/test_screen.cc
|
| index d0729c1877bac3af96fad63523d9e11df2327f58..cd96e35b85c7dcd57f2049185d344c58b48b6725 100644
|
| --- a/ui/gfx/test/test_screen.cc
|
| +++ b/ui/display/test/test_screen.cc
|
| @@ -4,9 +4,9 @@
|
|
|
| #include <vector>
|
|
|
| -#include "ui/gfx/test/test_screen.h"
|
| +#include "ui/display/test/test_screen.h"
|
|
|
| -namespace gfx {
|
| +namespace display {
|
| namespace test {
|
|
|
| TestScreen::TestScreen() {
|
| @@ -31,31 +31,31 @@ int TestScreen::GetNumDisplays() const {
|
| return 1;
|
| }
|
|
|
| -std::vector<gfx::Display> TestScreen::GetAllDisplays() const {
|
| - return std::vector<gfx::Display>(1, display_);
|
| +std::vector<Display> TestScreen::GetAllDisplays() const {
|
| + return std::vector<Display>(1, display_);
|
| }
|
|
|
| -gfx::Display TestScreen::GetDisplayNearestWindow(gfx::NativeView view) const {
|
| +Display TestScreen::GetDisplayNearestWindow(gfx::NativeView view) const {
|
| return display_;
|
| }
|
|
|
| -gfx::Display TestScreen::GetDisplayNearestPoint(const gfx::Point& point) const {
|
| +Display TestScreen::GetDisplayNearestPoint(const gfx::Point& point) const {
|
| return display_;
|
| }
|
|
|
| -gfx::Display TestScreen::GetDisplayMatching(const gfx::Rect& match_rect) const {
|
| +Display TestScreen::GetDisplayMatching(const gfx::Rect& match_rect) const {
|
| return display_;
|
| }
|
|
|
| -gfx::Display TestScreen::GetPrimaryDisplay() const {
|
| +Display TestScreen::GetPrimaryDisplay() const {
|
| return display_;
|
| }
|
|
|
| -void TestScreen::AddObserver(gfx::DisplayObserver* observer) {
|
| +void TestScreen::AddObserver(DisplayObserver* observer) {
|
| }
|
|
|
| -void TestScreen::RemoveObserver(gfx::DisplayObserver* observer) {
|
| +void TestScreen::RemoveObserver(DisplayObserver* observer) {
|
| }
|
|
|
| } // namespace test
|
| -} // namespace gfx
|
| +} // namespace display
|
|
|