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

Unified Diff: ash/wm/workspace/workspace_layout_manager_unittest.cc

Issue 2840043003: chromeos: Makes mushrome use simplified display management (Closed)
Patch Set: merge Created 3 years, 8 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/test/ash_test_helper.cc ('k') | chrome/app/mash/embedded_services.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 462f43283f9f4dfcadf52ea4dfc2d589775b6881..539cd2c358ebc30e2119d8037459d9049a78d40e 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -480,7 +480,7 @@ TEST_F(WorkspaceLayoutManagerTest, SizeToWorkArea) {
// TODO: fix. This test verifies that when a window is added the bounds are
// adjusted. CreateTestWindow() for mus adds, then sets the bounds (this comes
// from NativeWidgetAura), which means this test now fails for aura-mus.
- if (Shell::GetAshConfig() != Config::MASH) {
+ if (Shell::GetAshConfig() == Config::CLASSIC) {
EXPECT_EQ(gfx::Rect(gfx::Point(100, 101), work_area).ToString(),
window->GetBounds().ToString());
}
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | chrome/app/mash/embedded_services.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698