ash/test/ash_test_base.cc - Issue 2906873003: chromeos: turn on simplified display management for mash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/test/ash_test_base.cc

Issue 2906873003: chromeos: turn on simplified display management for mash (Closed)

Patch Set: really disable failing tests Created 3 years, 6 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:

Index: ash/test/ash_test_base.cc

diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc

index 1de82986a3aba0df5d9f74e83dd8e73b565b685e..ef6c1f159d367c62cb5ef4bd8d97a6e9f3cdff70 100644

--- a/ash/test/ash_test_base.cc

+++ b/ash/test/ash_test_base.cc

@@ -241,7 +241,7 @@ display::Display::Rotation AshTestBase::GetCurrentInternalDisplayRotation() {

}

void AshTestBase::UpdateDisplay(const std::string& display_specs) {

- if (Shell::GetAshConfig() == Config::MASH) {

+ if (!Shell::ShouldEnableSimplifiedDisplayManagement()) {

ash_test_helper_->UpdateDisplayForMash(display_specs);

} else {

display::test::DisplayManagerTestApi(Shell::Get()->display_manager())

« ash/shell.cc ('K') | « ash/shell.cc ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »