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

ash/wm_window.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/wm_window.h"
 
 #include "ash/ash_constants.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
@@ skipping 429 matching lines @@
 }
 
 void WmWindow::Hide() {
   window_->Hide();
 }
 
 void WmWindow::Show() {
   window_->Show();
 }
 
-void WmWindow::CloseWidget() {
-  if (Shell::GetAshConfig() == Config::MASH &&
-      aura_window()->GetProperty(kWidgetCreationTypeKey) ==
-          WidgetCreationType::FOR_CLIENT) {
-    // NOTE: in the FOR_CLIENT case there is not necessarily a widget associated
-    // with the window. Mash only creates widgets for top level windows if mash
-    // renders the non-client frame.
-    DCHECK(Shell::window_manager_client());
-    Shell::window_manager_client()->RequestClose(aura_window());
-    return;
-  }
-  views::Widget* widget = GetInternalWidgetForWindow(window_);
-  DCHECK(widget);
-  widget->Close();
-}
-
 void WmWindow::SetFocused() {
   aura::client::GetFocusClient(window_)->FocusWindow(window_);
 }
 
 bool WmWindow::IsFocused() const {
   return window_->HasFocus();
 }
 
 bool WmWindow::IsActive() const {
   return wm::IsActiveWindow(window_);
@@ skipping 82 matching lines @@
 void WmWindow::RemoveTransientWindowObserver(
     WmTransientWindowObserver* observer) {
   transient_observers_.RemoveObserver(observer);
   if (added_transient_observer_ &&
       !transient_observers_.might_have_observers()) {
     added_transient_observer_ = false;
     ::wm::TransientWindowManager::Get(window_)->RemoveObserver(this);
   }
 }
 
-void WmWindow::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
-  // In mus AddPreTargetHandler() only works for windows created by this client.
-  DCHECK(Shell::GetAshConfig() != Config::MASH ||
-         Shell::window_tree_client()->WasCreatedByThisClient(
-             aura::WindowMus::Get(window_)));
-  window_->AddPreTargetHandler(handler);
-}
-
-void WmWindow::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
-  window_->RemovePreTargetHandler(handler);
-}
-
 WmWindow::WmWindow(aura::Window* window) : window_(window) {
   window_->SetProperty(kWmWindowKey, this);
 }
 
 void WmWindow::OnTransientChildAdded(aura::Window* window,
                                      aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindow::OnTransientChildRemoved(aura::Window* window,
                                        aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash