Promotes WmWindowMus functions to WmWindowAura and nukes WmWindowMus

ash/aura/wm_window_aura.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/aura/wm_window_aura.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/shelf/shelf_item_types.h"
@@ skipping 13 matching lines @@
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
+#include "ui/aura/mus/window_manager_delegate.h"
+#include "ui/aura/mus/window_mus.h"
+#include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
@@ skipping 46 matching lines @@
 bool WmWindowAura::default_use_empty_minimum_size_for_testing_ = false;
 
 WmWindowAura::~WmWindowAura() {
   if (added_transient_observer_)
     ::wm::TransientWindowManager::Get(window_)->RemoveObserver(this);
 
   window_->RemoveObserver(this);
 }
 
 // static
-const WmWindow* WmWindowAura::Get(const aura::Window* window) {
+const WmWindowAura* WmWindowAura::Get(const aura::Window* window) {
   if (!window)
     return nullptr;
 
-  const WmWindow* wm_window = window->GetProperty(kWmWindowKey);
+  const WmWindowAura* wm_window = window->GetProperty(kWmWindowKey);
   if (wm_window)
     return wm_window;
-  DCHECK_EQ(aura::Env::Mode::LOCAL, aura::Env::GetInstance()->mode());
   // WmWindowAura is owned by the aura::Window.
   // TODO(sky): fix constness.
   return new WmWindowAura(const_cast<aura::Window*>(window));
 }
 
 // static
 std::vector<WmWindow*> WmWindowAura::FromAuraWindows(
     const std::vector<aura::Window*>& aura_windows) {
   std::vector<WmWindow*> result(aura_windows.size());
   for (size_t i = 0; i < aura_windows.size(); ++i)
@@ skipping 596 matching lines @@
 }
 
 views::Widget* WmWindowAura::GetInternalWidget() {
   return window_->GetProperty(kWidgetCreationTypeKey) ==
                  WidgetCreationType::INTERNAL
              ? views::Widget::GetWidgetForNativeView(window_)
              : nullptr;
 }
 
 void WmWindowAura::CloseWidget() {
+  if (aura::Env::GetInstance()->mode() == aura::Env::Mode::MUS &&
+      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.
+    Shell::window_manager_client()->RequestClose(aura_window());

[msw, 2017/01/12 00:14:42]

q: Should this DCHECK Shell::window_manager_client()?

[sky, 2017/01/12 14:43:44]

Done.

+    return;
+  }
   DCHECK(GetInternalWidget());
   GetInternalWidget()->Close();
 }
 
 void WmWindowAura::SetFocused() {
   aura::client::GetFocusClient(window_)->FocusWindow(window_);
 }
 
 bool WmWindowAura::IsFocused() const {
   return window_->HasFocus();
@@ skipping 126 matching lines @@
     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 WmWindowAura::AddLimitedPreTargetHandler(ui::EventHandler* handler) {
-  // This behaves differently from WmWindowMus for child and embedded windows.
+  // In mus AddPreTargetHandler() only works for windows created by this client.
+  DCHECK(aura::Env::GetInstance()->mode() == aura::Env::Mode::LOCAL ||
+         Shell::window_tree_client()->WasCreatedByThisClient(
+             aura::WindowMus::Get(window_)));
   window_->AddPreTargetHandler(handler);
 }
 
 void WmWindowAura::RemoveLimitedPreTargetHandler(ui::EventHandler* handler) {
   window_->RemovePreTargetHandler(handler);
 }
 
 WmWindowAura::WmWindowAura(aura::Window* window)
     : window_(window),
       // Mirrors that of aura::Window.
@@ skipping 110 matching lines @@
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
                                            aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash