Moves WmWindow::GetInternalWidget() into a standalone function

ash/common/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/common/wm_window.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/wm/window_state.h"
 #include "ash/common/wm_layout_manager.h"
 #include "ash/common/wm_transient_window_observer.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/resize_handle_window_targeter.h"
 #include "ash/wm/resize_shadow_controller.h"
+#include "ash/wm/widget_finder.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_mirror_view.h"
 #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"
@@ skipping 542 matching lines @@
 }
 
 void WmWindow::Hide() {
   window_->Hide();
 }
 
 void WmWindow::Show() {
   window_->Show();
 }
 
-views::Widget* WmWindow::GetInternalWidget() {
-  return window_->GetProperty(kWidgetCreationTypeKey) ==
-                 WidgetCreationType::INTERNAL
-             ? views::Widget::GetWidgetForNativeView(window_)
-             : nullptr;
-}
-
 void WmWindow::CloseWidget() {
   if (WmShell::Get()->IsRunningInMash() &&
       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;
   }
-  DCHECK(GetInternalWidget());
-  GetInternalWidget()->Close();
+  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();
 }
 
@@ skipping 161 matching lines @@
     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