Centralizes more shared code between ash and mash

ash/common/wm/workspace/workspace_layout_manager.cc

 // Copyright (c) 2012 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/workspace/workspace_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 189 matching lines @@
     UpdateShelfVisibility();
   }
 }
 
 void WorkspaceLayoutManager::OnWindowPropertyChanged(
     WmWindow* window,
     WmWindowProperty property) {
   if (property == WmWindowProperty::ALWAYS_ON_TOP &&
       window->GetBoolProperty(WmWindowProperty::ALWAYS_ON_TOP)) {
     WmWindow* container =
-        root_window_controller_->GetAlwaysOnTopController()->GetContainer(
+        root_window_controller_->always_on_top_controller()->GetContainer(
             window);
     if (window->GetParent() != container)
       container->AddChild(window);
   }
 }
 
 void WorkspaceLayoutManager::OnWindowStackingChanged(WmWindow* window) {
   UpdateShelfVisibility();
   UpdateFullscreenState();
   if (backdrop_delegate_)
@@ skipping 156 matching lines @@
   for (auto* window : windows) {
     wm::WindowState* window_state = window->GetWindowState();
     if (window_on_top)
       window_state->DisableAlwaysOnTop(window_on_top);
     else
       window_state->RestoreAlwaysOnTop();
   }
 }
 
 }  // namespace ash