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

Unified Diff: ash/wm/dock/docked_window_layout_manager_unittest.cc

Issue 2617733002: Hide docked windows behind a flag (Closed)
Patch Set: Fix tests failed because of DCHECK Created 3 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
Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
index 47c947d4c5786562504c5dcadabfc2d4260f3eb9..6123a7984f997a2dbe70b8f458e90bf6f7c165e7 100644
--- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
+++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -5,6 +5,7 @@
#include "ash/common/wm/dock/docked_window_layout_manager.h"
#include "ash/aura/wm_window_aura.h"
+#include "ash/common/ash_switches.h"
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/test/test_shelf_delegate.h"
#include "ash/common/wm/panels/panel_layout_manager.h"
@@ -18,6 +19,7 @@
#include "ash/test/shell_test_api.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
+#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
@@ -42,6 +44,8 @@ class DockedWindowLayoutManagerTest
virtual ~DockedWindowLayoutManagerTest() {}
void SetUp() override {
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ ash::switches::kAshEnableDockedWindows);
AshTestBase::SetUp();
UpdateDisplay("600x600");

Powered by Google App Engine
This is Rietveld 408576698