[mus+ash] Removes WmWindow from ash/shelf and ash/shell

ash/shelf/shelf_controller.cc

 // Copyright 2016 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/shelf/shelf_controller.h"
 
 #include "ash/public/interfaces/shelf.mojom.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/app_list_shelf_item_delegate.h"
@@ skipping 25 matching lines @@
 }
 
 ShelfController::~ShelfController() {}
 
 void ShelfController::BindRequest(mojom::ShelfControllerRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 void ShelfController::NotifyShelfInitialized(Shelf* shelf) {
   // Notify observers, Chrome will set alignment and auto-hide from prefs.
-  int64_t display_id = shelf->GetWindow()->GetDisplayNearestWindow().id();
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(shelf->GetWindow());
+  int64_t display_id = display.id();
   observers_.ForAllPtrs([display_id](mojom::ShelfObserver* observer) {
     observer->OnShelfInitialized(display_id);
   });
 }
 
 void ShelfController::NotifyShelfAlignmentChanged(Shelf* shelf) {
   ShelfAlignment alignment = shelf->alignment();
-  int64_t display_id = shelf->GetWindow()->GetDisplayNearestWindow().id();
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(shelf->GetWindow());
+  int64_t display_id = display.id();
   observers_.ForAllPtrs(
       [alignment, display_id](mojom::ShelfObserver* observer) {
         observer->OnAlignmentChanged(alignment, display_id);
       });
 }
 
 void ShelfController::NotifyShelfAutoHideBehaviorChanged(Shelf* shelf) {
   ShelfAutoHideBehavior behavior = shelf->auto_hide_behavior();
-  int64_t display_id = shelf->GetWindow()->GetDisplayNearestWindow().id();
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestWindow(shelf->GetWindow());
+  int64_t display_id = display.id();
   observers_.ForAllPtrs([behavior, display_id](mojom::ShelfObserver* observer) {
     observer->OnAutoHideBehaviorChanged(behavior, display_id);
   });
 }
 
 void ShelfController::AddObserver(
     mojom::ShelfObserverAssociatedPtrInfo observer) {
   mojom::ShelfObserverAssociatedPtr observer_ptr;
   observer_ptr.Bind(std::move(observer));
   observers_.AddPtr(std::move(observer_ptr));
@@ skipping 28 matching lines @@
 void ShelfController::UnpinItem(const std::string& app_id) {
   NOTIMPLEMENTED();
 }
 
 void ShelfController::SetItemImage(const std::string& app_id,
                                    const SkBitmap& image) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace ash