| Index: chrome/test/base/view_event_test_platform_part_default.cc
|
| diff --git a/chrome/test/base/view_event_test_platform_part_default.cc b/chrome/test/base/view_event_test_platform_part_default.cc
|
| index 2914bb606992a7349442bdb532f8498936b3774d..75050091c611d6c62a1c5e23890d07dfd50c670e 100644
|
| --- a/chrome/test/base/view_event_test_platform_part_default.cc
|
| +++ b/chrome/test/base/view_event_test_platform_part_default.cc
|
| @@ -7,7 +7,7 @@
|
| #include "base/macros.h"
|
| #include "chrome/test/base/view_event_test_platform_part.h"
|
| #include "ui/aura/env.h"
|
| -#include "ui/gfx/screen.h"
|
| +#include "ui/display/screen.h"
|
| #include "ui/views/widget/desktop_aura/desktop_screen.h"
|
|
|
| namespace {
|
| @@ -19,7 +19,7 @@ class ViewEventTestPlatformPartDefault : public ViewEventTestPlatformPart {
|
| ui::ContextFactory* context_factory) {
|
| #if defined(USE_AURA)
|
| screen_.reset(views::CreateDesktopScreen());
|
| - gfx::Screen::SetScreenInstance(screen_.get());
|
| + display::Screen::SetScreenInstance(screen_.get());
|
| env_ = aura::Env::CreateInstance();
|
| env_->set_context_factory(context_factory);
|
| #endif
|
| @@ -28,7 +28,7 @@ class ViewEventTestPlatformPartDefault : public ViewEventTestPlatformPart {
|
| ~ViewEventTestPlatformPartDefault() override {
|
| #if defined(USE_AURA)
|
| env_.reset();
|
| - gfx::Screen::SetScreenInstance(nullptr);
|
| + display::Screen::SetScreenInstance(nullptr);
|
| #endif
|
| }
|
|
|
| @@ -36,7 +36,7 @@ class ViewEventTestPlatformPartDefault : public ViewEventTestPlatformPart {
|
| gfx::NativeWindow GetContext() override { return NULL; }
|
|
|
| private:
|
| - std::unique_ptr<gfx::Screen> screen_;
|
| + std::unique_ptr<display::Screen> screen_;
|
| std::unique_ptr<aura::Env> env_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ViewEventTestPlatformPartDefault);
|
|
|