mash: remove more shell/shelf WmWindow usage.

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 251 matching lines @@
     int64_t display_id) {
   CHECK(HasInstance());
   WmWindow* root_window =
       instance_->shell_port_->GetRootWindowForDisplayId(display_id);
   return root_window ? root_window->GetRootWindowController() : nullptr;
 }
 
 // static
 aura::Window* Shell::GetPrimaryRootWindow() {
   CHECK(HasInstance());
-  return instance_->shell_port_->GetPrimaryRootWindow()->aura_window();
+  return instance_->shell_port_->GetPrimaryRootWindow();
 }
 
 // static
 aura::Window* Shell::GetRootWindowForNewWindows() {
   CHECK(Shell::HasInstance());
-  return WmWindow::GetAuraWindow(Shell::GetWmRootWindowForNewWindows());
-}
-
-// static
-WmWindow* Shell::GetWmRootWindowForNewWindows() {
-  CHECK(Shell::HasInstance());
   Shell* shell = Shell::Get();
   if (shell->scoped_root_window_for_new_windows_)
     return shell->scoped_root_window_for_new_windows_;
   return shell->root_window_for_new_windows_;
 }
 
 // static
 aura::Window::Windows Shell::GetAllRootWindows() {
   CHECK(HasInstance());
   aura::Window::Windows windows;
@@ skipping 163 matching lines @@
 void Shell::AddShellObserver(ShellObserver* observer) {
   shell_observers_.AddObserver(observer);
 }
 
 void Shell::RemoveShellObserver(ShellObserver* observer) {
   shell_observers_.RemoveObserver(observer);
 }
 
 void Shell::ShowAppList() {
   // Show the app list on the default display for new windows.
-  app_list_->Show(
-      GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
+  app_list_->Show(display::Screen::GetScreen()
+                      ->GetDisplayNearestWindow(GetRootWindowForNewWindows())
+                      .id());
 }
 
 void Shell::DismissAppList() {
   app_list_->Dismiss();
 }
 
 void Shell::ToggleAppList() {
   // Toggle the app list on the default display for new windows.
   app_list_->ToggleAppList(
-      GetWmRootWindowForNewWindows()->GetDisplayNearestWindow().id());
+      display::Screen::GetScreen()
+          ->GetDisplayNearestWindow(GetRootWindowForNewWindows())
+          .id());
 }
 
 bool Shell::IsAppListVisible() const {
   return app_list_->IsVisible();
 }
 
 bool Shell::GetAppListTargetVisibility() const {
   return app_list_->GetTargetVisibility();
 }
 
@@ skipping 444 matching lines @@
       base::MakeUnique<::wm::FocusController>(new wm::AshFocusRules());
   focus_controller_->AddObserver(this);
   if (config != Config::CLASSIC) {
     window_tree_client_->focus_synchronizer()->SetSingletonFocusClient(
         focus_controller_.get());
   }
 
   screen_position_controller_.reset(new ScreenPositionController);
 
   shell_port_->CreatePrimaryHost();
-  root_window_for_new_windows_ = WmWindow::Get(GetPrimaryRootWindow());
+  root_window_for_new_windows_ = GetPrimaryRootWindow();
 
   if (config != Config::MASH) {
     resolution_notification_controller_.reset(
         new ResolutionNotificationController);
   }
 
   if (cursor_manager_) {
     cursor_manager_->SetDisplay(
         display::Screen::GetScreen()->GetPrimaryDisplay());
   }
@@ skipping 266 matching lines @@
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
-  WmWindow* gained_active_wm = WmWindow::Get(gained_active);
-  if (gained_active_wm)
-    root_window_for_new_windows_ = gained_active_wm->GetRootWindow();
+  if (gained_active)
+    root_window_for_new_windows_ = gained_active->GetRootWindow();
 }
 
 void Shell::OnSessionStateChanged(session_manager::SessionState state) {
   // Create the shelf when a session becomes active. It's safe to do this
   // multiple times (e.g. initial login vs. multiprofile add session).
   if (state == session_manager::SessionState::ACTIVE) {
     CreateShelfView();
 
     if (GetAshConfig() != Config::MASH) {
       // Recreate the keyboard after initial login and after multiprofile login.
@@ skipping 21 matching lines @@
 void Shell::OnPrefServiceInitialized(
     std::unique_ptr<::PrefService> pref_service) {
   if (!instance_)
     return;
   // |pref_service_| is null if can't connect to Chrome (as happens when
   // running mash outside of chrome --mash and chrome isn't built).
   pref_service_ = std::move(pref_service);
 }
 
 }  // namespace ash