[mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace

ash/shelf/shelf_window_watcher.cc

 // Copyright 2013 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_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/public/cpp/config.h"
@@ skipping 179 matching lines @@
   // ShelfWindowWatcher[ItemDelegate] doesn't support multiple windows per item,
   // but this can happen in Mash (eg. when multiple browser windows are open).
   // Assign a unique launch id in this case to avoid crashing on DCHECKs.
   // TODO(msw): Remove Mash duplicate ShelfID handling. crbug.com/722496
   if (Shell::GetAshConfig() == Config::MASH &&
       model_->ItemIndexByID(item.id) > 0) {
     static int id = 0;
     item.id.launch_id = base::IntToString(id++);
   }
 
-  model_->SetShelfItemDelegate(item.id,
-                               base::MakeUnique<ShelfWindowWatcherItemDelegate>(
-                                   item.id, WmWindow::Get(window)));
+  model_->SetShelfItemDelegate(
+      item.id,
+      base::MakeUnique<ShelfWindowWatcherItemDelegate>(item.id, window));
   // Panels are inserted on the left so as not to push all existing panels over.
   model_->AddAt(item.type == TYPE_APP_PANEL ? 0 : model_->item_count(), item);
 }
 
 void ShelfWindowWatcher::RemoveShelfItem(aura::Window* window) {
   user_windows_with_items_.erase(window);
   const ShelfID shelf_id = GetShelfID(window);
   DCHECK(!shelf_id.IsNull());
   const int index = model_->ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
@@ skipping 82 matching lines @@
   }
 }
 
 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
                                                  uint32_t) {}
 
 }  // namespace ash