Refactor direct use of the default container ID
For virtual desks, and for tracking the windows in each desk in
a separate container, the default container should no longer be
used directly. Users should instead query the currently active
desk container.
BUG=866622
Change-Id: Ie121b5e488a629307511c1b79eb0ee5e9d66f422
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1559348
Reviewed-by: Mitsuru Oshima <[email protected]>
Reviewed-by: Sergey Ulanov <[email protected]>
Commit-Queue: Ahmed Fakhry <[email protected]>
Cr-Commit-Position: refs/heads/master@{#649755}diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc
index bbc931bb..84a4514d 100644
--- a/ash/screen_util_unittest.cc
+++ b/ash/screen_util_unittest.cc
@@ -12,6 +12,7 @@
#include "ash/shelf/shelf_constants.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
+#include "ash/wm/desks/desks_util.h"
#include "ash/wm/window_util.h"
#include "ash/wm/wm_event.h"
#include "ui/aura/env.h"
@@ -231,7 +232,7 @@
UpdateDisplay("1366x768");
std::unique_ptr<aura::Window> window = CreateToplevelTestWindow(
- gfx::Rect(300, 300, 200, 150), kShellWindowId_DefaultContainer);
+ gfx::Rect(300, 300, 200, 150), desks_util::GetActiveDeskContainerId());
auto* docked_magnifier_controller =
Shell::Get()->docked_magnifier_controller();
