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

Unified Diff: chrome/test/base/view_event_test_platform_part_ash.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: fixes Created 4 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
Index: chrome/test/base/view_event_test_platform_part_ash.cc
diff --git a/chrome/test/base/view_event_test_platform_part_ash.cc b/chrome/test/base/view_event_test_platform_part_ash.cc
index b46982b8c97752a88eff61dec612826b8323a873..3e4ef94764e75de2e6c9168488428b6c7617596e 100644
--- a/chrome/test/base/view_event_test_platform_part_ash.cc
+++ b/chrome/test/base/view_event_test_platform_part_ash.cc
@@ -37,14 +37,14 @@ ViewEventTestPlatformPartAsh::ViewEventTestPlatformPartAsh(
: screen_(views::CreateDesktopScreen()) {
// http://crbug.com/154081 use ash::Shell code path below on win_ash bots when
// interactive_ui_tests is brought up on that platform.
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
+ gfx::Screen::SetScreenInstance(screen_.get());
aura::Env::CreateInstance(true);
aura::Env::GetInstance()->set_context_factory(context_factory);
}
ViewEventTestPlatformPartAsh::~ViewEventTestPlatformPartAsh() {
aura::Env::DeleteInstance();
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr);
+ gfx::Screen::SetScreenInstance(nullptr);
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698