mash: remove more shell/shelf WmWindow usage.

ash/wm/window_cycle_list.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/window_cycle_list.h"
 
 #include <list>
 #include <map>
 
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 514 matching lines @@
 
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.delegate = cycle_view_;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.accept_events = true;
   params.name = "WindowCycleList (Alt+Tab)";
   // TODO(estade): make sure nothing untoward happens when the lock screen
   // or a system modal dialog is shown.
-  WmWindow* root_window = Shell::GetWmRootWindowForNewWindows();
-  root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
-      widget, kShellWindowId_OverlayContainer, &params);
-  gfx::Rect widget_rect = root_window->GetDisplayNearestWindow().bounds();
+  aura::Window* root_window = Shell::GetRootWindowForNewWindows();
+  GetRootWindowController(root_window)
+      ->ConfigureWidgetInitParamsForContainer(
+          widget, kShellWindowId_OverlayContainer, &params);
+  gfx::Rect widget_rect = display::Screen::GetScreen()
+                              ->GetDisplayNearestWindow(root_window)
+                              .bounds();
   const int widget_height = cycle_view_->GetPreferredSize().height();
   widget_rect.set_y(widget_rect.y() +
                     (widget_rect.height() - widget_height) / 2);
   widget_rect.set_height(widget_height);
   params.bounds = widget_rect;
   widget->Init(params);
 
   screen_observer_.Add(display::Screen::GetScreen());
   widget->Show();
   cycle_ui_widget_ = widget;
 }
 
 }  // namespace ash