Removes ShellPort::IsRunningInMash()

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/aura/aura_layout_manager_adapter.h"
+#include "ash/public/cpp/config.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/shell_port.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.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_layout_manager.h"
@@ skipping 545 matching lines @@
 
 void WmWindow::Hide() {
   window_->Hide();
 }
 
 void WmWindow::Show() {
   window_->Show();
 }
 
 void WmWindow::CloseWidget() {
-  if (ShellPort::Get()->IsRunningInMash() &&
+  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_);
@@ skipping 42 matching lines @@
 
 std::vector<WmWindow*> WmWindow::GetChildren() {
   return FromAuraWindows(window_->children());
 }
 
 WmWindow* WmWindow::GetChildByShellWindowId(int id) {
   return Get(window_->GetChildById(id));
 }
 
 void WmWindow::ShowResizeShadow(int component) {
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     // TODO: http://crbug.com/640773.
     return;
   }
   ResizeShadowController* resize_shadow_controller =
       Shell::Get()->resize_shadow_controller();
   if (resize_shadow_controller)
     resize_shadow_controller->ShowShadow(window_, component);
 }
 
 void WmWindow::HideResizeShadow() {
-  if (ShellPort::Get()->IsRunningInMash()) {
+  if (Shell::GetAshConfig() == Config::MASH) {
     // TODO: http://crbug.com/640773.
     return;
   }
   ResizeShadowController* resize_shadow_controller =
       Shell::Get()->resize_shadow_controller();
   if (resize_shadow_controller)
     resize_shadow_controller->HideShadow(window_);
 }
 
 void WmWindow::InstallResizeHandleWindowTargeter(
@@ skipping 50 matching lines @@
   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(!ShellPort::Get()->IsRunningInMash() ||
+  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)
@@ skipping 28 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