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

Unified Diff: chrome/test/base/view_event_test_platform_part_default.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: and another rebase 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
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer.cc ('k') | chromecast/browser/cast_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ff855df4cc33a4bfe523bc816eeb1084d56a131e..8a3de63a9f4fa8cf1565b08acc24b39ebf826d70 100644
--- a/chrome/test/base/view_event_test_platform_part_default.cc
+++ b/chrome/test/base/view_event_test_platform_part_default.cc
@@ -18,7 +18,7 @@ class ViewEventTestPlatformPartDefault : public ViewEventTestPlatformPart {
ui::ContextFactory* context_factory) {
#if defined(USE_AURA)
screen_.reset(views::CreateDesktopScreen());
- 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);
#endif
@@ -27,7 +27,7 @@ class ViewEventTestPlatformPartDefault : public ViewEventTestPlatformPart {
~ViewEventTestPlatformPartDefault() override {
#if defined(USE_AURA)
aura::Env::DeleteInstance();
- gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr);
+ gfx::Screen::SetScreenInstance(nullptr);
#endif
}
« no previous file with comments | « chrome/browser/ui/window_sizer/window_sizer.cc ('k') | chromecast/browser/cast_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698