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

Unified Diff: ash/mus/test/ash_test_impl_mus.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/mus/main.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/test/ash_test_impl_mus.cc
diff --git a/ash/mus/test/ash_test_impl_mus.cc b/ash/mus/test/ash_test_impl_mus.cc
index 92e5bb591200e073140e5e4eb45b7f90829396c7..b9e5f50f8e136d77fc36e0c8513c1120376a4d3b 100644
--- a/ash/mus/test/ash_test_impl_mus.cc
+++ b/ash/mus/test/ash_test_impl_mus.cc
@@ -6,10 +6,12 @@
#include "ash/test/ash_test.h"
#include "ash/wm_window.h"
+#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
#include "ui/aura/window.h"
+#include "ui/display/display_switches.h"
#include "ui/wm/core/window_util.h"
namespace ash {
@@ -40,6 +42,13 @@ AshTestImplMus::AshTestImplMus()
AshTestImplMus::~AshTestImplMus() {}
void AshTestImplMus::SetUp() {
+ // This matches what AshTestBase does.
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ if (!command_line->HasSwitch(::switches::kHostWindowBounds)) {
+ command_line->AppendSwitchASCII(::switches::kHostWindowBounds,
+ "1+1-800x600");
+ }
+
wm_test_base_->SetUp();
}
« no previous file with comments | « ash/mus/main.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698