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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/ash_test_base.cc

Issue 12217120: Add IsInternal property to gfx::Display (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Nits + Rebase Created 7 years, 10 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 | « ash/system/chromeos/tray_display.cc ('k') | chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos.cc » ('j') | ui/gfx/display.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 5b4a6b6ecd85a1fbc756b3c7eeebe6985131d2f7..429cc825d1b691bbfe7afe76678f77c237ecdb81 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -135,6 +135,9 @@ void AshTestBase::TearDown() {
metro_viewer_host_.reset();
#endif
event_generator_.reset();
+ // Some tests set an internal display id,
+ // reset it here, so other tests will continue in a clean environment.
+ gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
}
aura::test::EventGenerator& AshTestBase::GetEventGenerator() {
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos.cc » ('j') | ui/gfx/display.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698