Change GetContainer to take a root window

Update the use of GetContainer to use the correct root window.

BUG=123160
TEST=no functional change. all tests must pass.

Review URL: https://chromiumcodereview.appspot.com/10540076

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141384 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 5 deletions

diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc
index 3c90679..6b72fce 100644
--- a/ash/shell/lock_view.cc
+++ b/ash/shell/lock_view.cc
@@ -91,9 +91,9 @@ void CreateLockScreen() {
                             (root_window_size.height() - ps.height()) / 2,
                             ps.width(), ps.height());
   params.delegate = lock_view;
-  params.parent =
-      Shell::GetInstance()->GetContainer(
-          ash::internal::kShellWindowId_LockScreenContainer);
+  params.parent = Shell::GetContainer(
+      Shell::GetPrimaryRootWindow(),
+      internal::kShellWindowId_LockScreenContainer);
   widget->Init(params);
   widget->SetContentsView(lock_view);
   widget->Show();
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index cbac740..a3d99f1 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -15,8 +15,9 @@ namespace shell {
 
 WindowWatcher::WindowWatcher()
     : window_(ash::Shell::GetInstance()->launcher()->window_container()),
-      panel_container_(ash::Shell::GetInstance()->GetContainer(
-          ash::internal::kShellWindowId_PanelContainer)) {
+      panel_container_(ash::Shell::GetContainer(
+          Shell::GetPrimaryRootWindow(),
+          internal::kShellWindowId_PanelContainer)) {
   window_->AddObserver(this);
   panel_container_->AddObserver(this);
 }